Kenny Guy 7c127bbaf1 Merge "Update suspended to disabled." into nyc-dev ...

am: 646a817caf

* commit '646a817caff4875462c15128f2e8c5d5c83629b3':
  Update suspended to disabled.

Change-Id: I094736609247a7916ac0aa5dc85c448a3b4b3970

2016-05-25 15:57:56 +00:00

..

java

Hide work profile key in user credentials screen

2016-05-25 13:20:51 +00:00

jni

Merge "Fix misc-macro-parentheses warnings in audio media jni." am: 9ecb10d1b5

2016-05-24 18:56:37 +00:00

res

Merge "Update suspended to disabled." into nyc-dev

2016-05-25 15:57:56 +00:00

tests

Merge "Improve performance of LocaleList with Resources" into nyc-dev

2016-05-24 21:35:56 +00:00