Makoto Onuki e08b704cb7 Update CP2 javadoc am: 93d94ebac2 ...

am: e3972019dc

Change-Id: Ia988c68813311b042c6ba9fbaa3c486935e5566b

2016-08-30 22:49:57 +00:00

..

java

Update CP2 javadoc am: 93d94ebac2

2016-08-30 22:49:57 +00:00

jni

Merge "Fix google-explicit-constructor warnings in core/jni." am: cfc9f5d03d am: ed4b31f9e1

2016-08-30 20:48:03 +00:00

res

Allow apps with CREATE_USERS permission to create demo users. am: 234d1afd79

2016-08-30 18:05:51 +00:00

tests

DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp

2016-08-29 17:46:44 -07:00