Joseph Pirozzo 976bf029aa Merge "PBAP connect to alternate device." into nyc-dev ...

am: a951a59

* commit 'a951a593c080ade962c70b30da6ff9b059225e61':
  PBAP connect to alternate device.

Change-Id: I0ea0cd141cd9d3eef3c4a45be04b113d73eaf358

2016-04-05 23:47:50 +00:00

..

res

Merge "Import translations. DO NOT MERGE" into nyc-dev

2016-04-05 03:22:27 +00:00

src/com/android/settingslib

Merge "PBAP connect to alternate device." into nyc-dev

2016-04-05 23:39:20 +00:00

tests

…

Android.mk

Move restricted padlock support to SettingsLib

2016-01-12 18:14:24 +00:00

AndroidManifest.xml

…

common.mk

…