Selim Cinek a7ea41c7d7 Merge "Fixed a bug with decorated custom views" into oc-mr1-dev ...

am: 9d41e8cd47

Change-Id: I36099788ad09bb8035374c2ca27caffabc21dfb0

2017-08-22 23:20:24 +00:00

..

java

Merge "Fixed a bug with decorated custom views" into oc-mr1-dev

2017-08-22 23:20:24 +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