Sudheer Shanka 8ebc6e80b8 Merge "Avoid triggering support dialog in non-current user." into nyc-dev ...

am: 5548733eb5

* commit '5548733eb5163ef9f3c642314d2d217503c90d64':
  Avoid triggering support dialog in non-current user.

Change-Id: I243f2699a5840294e0de9efc5e95011fd83dca37

2016-06-03 17:13:03 +00:00

..

res

Import translations. DO NOT MERGE

2016-06-01 06:09:15 -07:00

src/com/android/settingslib

Merge "Avoid triggering support dialog in non-current user." into nyc-dev

2016-06-03 17:02:53 +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