Chen Xu 2256bef570 Merge "rename notification channel" into oc-mr1-dev ...

am: 23228db866

Change-Id: Ic7de8fddbb7fec88aa9b8b945b2b45601be6b0b1

2017-08-05 23:07:00 +00:00

..

java

Merge "Pass ProgramInfo over currentProgramInfoChanged and drop afSwitch_1_1." into oc-mr1-dev

2017-08-05 20:59:17 +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 "rename notification channel" into oc-mr1-dev

2017-08-05 23:07:00 +00:00

tests

Pass vendor-specific info as map.

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