Shuzhen Wang 7ff3038385 Merge "Camera2: Legacy: Add onRequestQueueEmpty callback" into oc-mr1-dev ...

am: 4dde010145

Change-Id: Ib2ea8e264fbb4a0833b2cae0f62c6485ea6f0613

2017-08-11 23:45:11 +00:00

..

java

Merge "Camera2: Legacy: Add onRequestQueueEmpty callback" into oc-mr1-dev

2017-08-11 23:45:11 +00:00

jni

Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master am: 3f378940c2 am: 93d8497094

2017-08-11 20:20:29 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

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

res

Merge "Change SystemApi as per API council feedback" into oc-mr1-dev

2017-08-11 18:06:46 +00:00

tests

Merge "DropBoxManagerService: Don't store redundant information" into oc-mr1-dev

2017-08-10 00:18:56 +00:00