Todd Kennedy db6cd50708 Merge \"fix prefix generation\" into nyc-mr1-dev ...

am: 0f8427773e

Change-Id: I4614c85ce7e08bbd5d30d8cebc3a77294154a577

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

..

java

Merge \"fix prefix generation\" into nyc-mr1-dev

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

jni

Merge changes from topic \'VectorDrawable polishing cherrypicks from master\' into nyc-mr1-dev

2016-06-09 23:42:16 +00:00

res

Merge \\"Protect the android.intent.action.CALL_PRIVILEGED broadcast\\" into nyc-dev am: c94872e940

2016-06-09 22:56:47 +00:00

tests

Merge \"Update enable/disable code to reduce flakiness\" into nyc-mr1-dev

2016-06-08 23:33:47 +00:00