Lalit Maganti 81dfe744d6 resolve merge conflicts of 0cb277ef87 to pi-dev-plus-aosp ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7c5ad527cd57659a7ae1d913580bd1f613bee9dd

2018-09-27 16:43:27 +01:00

..

assets

…

res

resolve merge conflicts of 0cb277ef87 to pi-dev-plus-aosp

2018-09-27 16:43:27 +01:00

Android.bp

…

AndroidManifest.xml

Merge "WRITE_APN_SETTINGS is also required to read" am: 0beefc0af5

2018-07-12 11:56:50 -07:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…