commit 55dda5a69571730a1db2adfe948e7bcc28f10cbe
author Dario Freni <dariofreni@google.com> Sat Apr 14 23:00:28 2018 +0100
committer Dario Freni <dariofreni@google.com> Sat Apr 14 23:12:16 2018 +0100
tree 1cb64c2c3e048bca9b18e68db36c9b91a5d6fa9d
parent db223cf525fa7b28ef4e2cd698858560a8cf8997

Merge manifests for LOCAL_STATIC_ANDROID_LIBRARIES.

Requires bumping or setting minSdk explicitly in some modules.

Test: m -j
Change-Id: If144d17c93c6eb9c7c1099d2f722fd6c99b98759

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 716e611..cadb431 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -9,6 +9,8 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.SET_PREFERRED_APPLICATIONS" />
 
+    <uses-sdk android:minSdkVersion="21"/>
+
     <application
         android:name=".DocumentsApplication"
         android:label="@string/app_label"