Phil Weaver df79ca699d Merge "Place focus on window when a11y performs an action" into oc-mr1-dev ...

am: c6c9e089db

Change-Id: Iea95db16258ad071852a5925eb69069e432c8e74

2017-08-22 16:52:12 +00:00

..

java

Merge "Place focus on window when a11y performs an action" into oc-mr1-dev

2017-08-22 16:52:12 +00:00

jni

Merge "heif: add new file and mime types to MediaScanner -- DO NOT MERGE" into oc-mr1-dev

2017-08-21 05:44:38 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

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

res

Import translations. DO NOT MERGE

2017-08-17 17:49:23 -07:00

tests

Merge "Add convenience methods to IpPrefix and LinkAddress" into oc-mr1-dev

2017-08-17 22:31:59 +00:00