Justin Klaassen 3704bb0740 Merge "Remove config_demoModePackage resource" into oc-dr1-dev ...

am: 934a1081fe

Change-Id: I31ce02bfd8c736d8e0d46173759558faf7a6cc2f

2017-08-10 06:53:34 +00:00

..

java

Merge "Go: add features for low ram / normal ram devices." into oc-mr1-dev

2017-08-10 04:35:09 +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 "Remove config_demoModePackage resource" into oc-dr1-dev

2017-08-10 06:53:34 +00:00

tests

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

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