Jack He 6c008738d3 Merge "Bluetooth: Add flag for human readable name" into oc-mr1-dev am: 34eac2c59b ...

am: 10edd06b15

Change-Id: Ieb0ac6a65d7e56b074832f3909f9becbc5012b5b

2017-08-24 13:50:48 +00:00

..

res

Merge "Import translations. DO NOT MERGE"

2017-08-24 08:25:01 +00:00

src/com/android/settingslib

Merge "Bluetooth: Add flag for human readable name" into oc-mr1-dev am: 34eac2c59b

2017-08-24 13:50:48 +00:00

tests

Merge "Bluetooth: Add flag for human readable name" into oc-mr1-dev am: 34eac2c59b

2017-08-24 13:50:48 +00:00

Android.mk

…

AndroidManifest.xml

…

common.mk

Add missing resource when building in AAPT1

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