Todd Kennedy e4de49140d Merge "Only log resolution when starting activities" into oc-mr1-dev

2017-08-22 23:00:58 +00:00

..

java

Merge "Only log resolution when starting activities" into oc-mr1-dev

2017-08-22 23:00:58 +00:00

jni

heif: add new file and mime types to MediaScanner -- DO NOT MERGE

2017-08-19 00:05:06 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

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

res

Merge "Fix error message strings" into oc-mr1-dev

2017-08-17 23:45:05 +00:00

tests

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

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