commit eab9c744615c533e979533214f519e2732e640ec
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Dec 19 07:16:30 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 19 07:16:30 2017 +0000
tree b8b620a235d5113dc8ea6fc8c9e93fb938678f03
parent 1756d6ad72c3ecd7639a8179d62ffcbf8f1593d6
parent 5667bad110a23d5347e43e8acc824b0a6e4f2379

Merge changes from topic "am-3cd36979-4789-4903-b753-2c3ba65bba33"

* changes:
  [automerger] resolve merge conflicts of fbc76f93f0fe94924515a34654387c1dea5162af to oc-mr1-jetpack-dev am: 6319e4c19b
  resolve merge conflicts of fbc76f93f0fe94924515a34654387c1dea5162af to oc-mr1-jetpack-dev

v13/tests/AndroidManifest.xml

diff --git a/v13/tests/AndroidManifest.xml b/v13/tests/AndroidManifest.xml
index 541a37f..3097555 100644
--- a/v13/tests/AndroidManifest.xml
+++ b/v13/tests/AndroidManifest.xml
@@ -17,6 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="android.support.v13.test">
     <uses-sdk android:targetSdkVersion="${target-sdk-version}"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
     <application>
         <activity android:name="android.support.v13.app.FragmentCompatTestActivity" />