Resolve conflicts for merge of 'c4e87c28' into master
Conflicts:
prebuilts/gradle/ActionBarCompat-Basic/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/ActionBarCompat-ListPopupMenu/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/ActionBarCompat-ShareActionProvider/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/ActionBarCompat-Styled/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/ActivityInstrumentation/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/build.gradle
prebuilts/gradle/ActivitySceneTransitionBasic/README.md
prebuilts/gradle/AdapterTransition/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/AdvancedImmersiveMode/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/AppRestrictions/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/BasicAccessibility/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/BasicAndroidKeyStore/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/BasicContactables/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/BasicGestureDetect/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/BasicImmersiveMode/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/BasicManagedProfile/README.md
prebuilts/gradle/BasicManagedProfile/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/BasicMediaDecoder/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/BasicMediaRouter/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/BasicMultitouch/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/BasicNetworking/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/BasicNotifications/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/BasicRenderScript/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/BasicSyncAdapter/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/BasicTransition/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/BatchStepSensor/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/BluetoothLeGatt/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/BorderlessButtons/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/Camera2Basic/Camera2BasicSample/build.gradle
prebuilts/gradle/Camera2Basic/README.md
prebuilts/gradle/Camera2Basic/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/Camera2Video/Camera2VideoSample/build.gradle
prebuilts/gradle/Camera2Video/README.md
prebuilts/gradle/Camera2Video/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/CardEmulation/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/CardReader/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/CardView/CONTRIB.md
prebuilts/gradle/CardView/README.md
prebuilts/gradle/CardView/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/ClippingBasic/README.md
prebuilts/gradle/ClippingBasic/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/CustomChoiceList/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/CustomNotifications/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/CustomTransition/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/DisplayingBitmaps/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/DoneBar/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/DrawableTinting/README.md
prebuilts/gradle/DrawableTinting/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/ElevationBasic/README.md
prebuilts/gradle/ElevationDrag/README.md
prebuilts/gradle/ElevationDrag/gradle/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/ElevationDrag/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/FloatingActionButtonBasic/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/FragmentTransition/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/HorizontalPaging/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/ImmersiveMode/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/Interpolator/README.md
prebuilts/gradle/Interpolator/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/JobScheduler/JobSchedulerSample/build.gradle
prebuilts/gradle/JobScheduler/README.md
prebuilts/gradle/JobScheduler/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/LNotifications/README.md
prebuilts/gradle/LNotifications/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/MediaRecorder/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/MediaRouter/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/build.gradle
prebuilts/gradle/NavigationDrawer/README.md
prebuilts/gradle/NetworkConnect/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/PdfRendererBasic/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/RecyclerView/Application/src/main/java/com/example/android/recyclerview/CustomAdapter.java
prebuilts/gradle/RecyclerView/Application/src/main/java/com/example/android/recyclerview/RecyclerViewFragment.java
prebuilts/gradle/RecyclerView/Application/src/main/res/layout/recycler_view_frag.xml
prebuilts/gradle/RecyclerView/Application/src/main/res/layout/text_row_item.xml
prebuilts/gradle/RecyclerView/Application/src/main/res/values/base-strings.xml
prebuilts/gradle/RecyclerView/Application/src/main/res/values/strings.xml
prebuilts/gradle/RecyclerView/CONTRIB.md
prebuilts/gradle/RecyclerView/README.md
prebuilts/gradle/RecyclerView/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/build.gradle
prebuilts/gradle/RenderScriptIntrinsic/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/RepeatingAlarm/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/RevealEffectBasic/gradle/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/RevealEffectBasic/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/SlidingTabsBasic/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/SlidingTabsColors/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/StorageClient/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/StorageProvider/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/SwipeRefreshLayoutBasic/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/SwipeRefreshListFragment/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/SwipeRefreshMultipleViews/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/TextLinkify/gradle/wrapper/gradle-wrapper.properties
prebuilts/gradle/TextSwitcher/gradle/wrapper/gradle-wrapper.properties
Change-Id: I82133e57e002691ccd75aa8790f72660257c1e30