Marie Janssen ca312c1cd3 Merge "Bluetooth: add getDiscoveryEndMillis() call" am: 1785fc4eea ...

am: 7f8d8638eb

Change-Id: I6f02c4ddc0fe56cda5af2dcf2f5193ba13522792

2017-01-30 17:57:02 +00:00

..

res

Merge "Increase the character limit for "Use System Selection" message" am: a7ce460921

2017-01-26 23:46:49 +00:00

src/com/android/settingslib

Merge "Bluetooth: add getDiscoveryEndMillis() call" am: 1785fc4eea

2017-01-30 17:57:02 +00:00

tests

…

Android.mk

SettingsLib: Build with AAPT2

2016-04-14 14:45:21 -07:00

AndroidManifest.xml

…

common.mk

SettingsLib: Build with AAPT2

2016-04-14 14:45:21 -07:00