Kenny Guy f9e2262477 Merge "Update suspended to disabled." into nyc-dev am: 646a817caf ...

am: 7c127bbaf1

* commit '7c127bbaf15aa26188c0b708aaecddc186a564ee':
  Update suspended to disabled.

Change-Id: Ide218ddbf990d25beff5e24d9ca8b3db52e2f246

2016-05-25 16:00:55 +00:00

..

java

Hide work profile key in user credentials screen am: d398244513

2016-05-25 13:27:41 +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 am: 646a817caf

2016-05-25 16:00:55 +00:00

tests

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

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