Justin Klaassen 80f15b0594 Merge "Update Qualcomm(R) aptX(TM) strings" into oc-dr1-dev am: 8d7cd4bcaa ...

am: aaedb0e191

Change-Id: Ie8c5318db7dfb4dfa4009e9cb34ccc618bcc8077

2017-08-15 17:59:08 +00:00

..

res

Merge "Update Qualcomm(R) aptX(TM) strings" into oc-dr1-dev am: 8d7cd4bcaa

2017-08-15 17:59:08 +00:00

src/com/android/settingslib

Merge "Remove logic for parsing dismiss rule" into oc-mr1-dev

2017-08-08 22:13:11 +00:00

tests

Merge "Remove logic for parsing dismiss rule" into oc-mr1-dev

2017-08-08 22:13:11 +00:00

Android.mk

…

AndroidManifest.xml

…

common.mk

Add missing resource when building in AAPT1

2017-07-07 21:23:16 -07:00