Philip P. Moltmann 127c9715b4 Merge \"Merge \\"Do not remove handlers for loaders.\\" into nyc-mr1-dev am: b6ee468b3e\" into nyc-mr1-dev-plus-aosp ...

am: 1134308842

Change-Id: I80459fe11f37ad937c5855d296a81b2d002370d2

2016-06-27 18:28:25 +00:00

..

java

Merge \"Merge \\"Do not remove handlers for loaders.\\" into nyc-mr1-dev am: b6ee468b3e\" into nyc-mr1-dev-plus-aosp

2016-06-27 18:28:25 +00:00

jni

Merge \\\"When uninstalling, only kill the requested user.\\\" into nyc-dev am: 060d5a0e0a am: 803a316d6e

2016-06-23 18:50:50 +00:00

res

Import translations. DO NOT MERGE

2016-06-27 02:50:00 -07:00

tests

Merge "Add missing test annotation to ActionMode tests"

2016-06-27 16:10:47 +00:00