Pankaj Kanwar 4ac331fc3e Merge "Adding strings to support warning about emergency calls." into oc-mr1-dev ...

am: d4932d9b5d

Change-Id: Ic006b5ab9159885606bdb47a792b5b8d7e9a62ca

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

..

java

Merge "Fix broken javadocs." into oc-mr1-dev

2017-08-06 16:45:10 +00:00

jni

Merge "Add dirty_image_objects file." am: 935e0c996a am: 7dce8cbdeb am: 2c7efb994b

2017-08-05 01:30:02 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

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

res

Merge "Adding strings to support warning about emergency calls." into oc-mr1-dev

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

tests

Pass vendor-specific info as map.

2017-08-03 18:21:22 -07:00