Ricky Wai 7b1ccf8700 Merge "Hide work profile key in user credentials screen am: d398244513 am: ed39b3b166" into nyc-mr1-dev-plus-aosp ...

am: b5e2592582

* commit 'b5e25925828dd5a23eaa2ea3a4cebcc6652d2762':
  Hide work profile key in user credentials screen

Change-Id: Ie10f57378d3cf1168a9200bf02f3b46d2d1bfe4b

2016-05-25 13:34:55 +00:00

..

java

Merge "Hide work profile key in user credentials screen am: d398244513 am: ed39b3b166" into nyc-mr1-dev-plus-aosp

2016-05-25 13:34:55 +00:00

jni

Merge "Merge "Fix misc-macro-parentheses warnings in audio media jni." am: 9ecb10d1b5 am: ca3f49d594" into nyc-dev-plus-aosp am: a90bd3a04a

2016-05-24 19:30:09 +00:00

res

Merge "Fix issue #28931042: wtf in system server" into nyc-dev am: 7a1aa92610 am: 9bebd9edb0

2016-05-25 00:30:46 +00:00

tests

Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb am: 5e106dea45

2016-05-24 21:47:36 +00:00