Phil Weaver 34f79a67ee Merge "Stop focusing views before layout." into oc-dr1-dev ...

am: a5dab05b61

Change-Id: I31f4ce541ac56887549a654b5e313e1f361152c3

2017-08-10 22:44:39 +00:00

..

java

Merge "Stop focusing views before layout." into oc-dr1-dev

2017-08-10 22:44:39 +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:20:47 +00:00

tests

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

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