Hall Liu 6b3ce948c6 Merge "Hide the SEND_EMBMS_INTENTS permission" into oc-mr1-dev ...

am: d259d8b80f

Change-Id: I5abcbb619d38beb28be00f34a1ee3cffe351c721

2017-08-10 18:29:19 +00:00

..

java

Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev

2017-08-10 15:41:36 +00:00

jni

Support copying from index8 into another index8.

2017-08-09 18:41:29 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

2017-07-21 15:51:32 +00:00

res

Merge "Hide the SEND_EMBMS_INTENTS permission" into oc-mr1-dev

2017-08-10 18:29:19 +00:00

tests

Merge "DropBoxManagerService: Don't store redundant information" into oc-mr1-dev

2017-08-10 00:18:56 +00:00