Sudheer Shanka 2771de2d56 Merge "Avoid triggering support dialog in non-current user." into nyc-dev am: 5548733eb5 ...

am: 8ebc6e80b8

* commit '8ebc6e80b817a4cef84f074aa14607d2c380b8f7':
  Avoid triggering support dialog in non-current user.

Change-Id: I3850b49c3814befd34ec04a9264889175de0c9e8

2016-06-03 17:23:59 +00:00

..

res

Import translations. DO NOT MERGE

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

src/com/android/settingslib

Merge "Avoid triggering support dialog in non-current user." into nyc-dev am: 5548733eb5

2016-06-03 17:23:59 +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