Eino-Ville Talvala 01d6fb2c9c Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev ...

am: 0c0fd0375c

Change-Id: I1d67c1f2cdaa28063110454592cf7306ecb7bcd2

2017-07-14 05:49:45 +00:00

..

java

Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev

2017-07-14 05:49:45 +00:00

jni

Merge "Add configureRpcThreadpool to java interface" am: d8dab11547 am: 791a698a6a

2017-07-13 19:33:29 +00:00

proto/android

…

res

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

2017-07-13 16:01:10 +00:00

tests

Merge "AOD: Implement long press gesture to launch assist" into oc-dr1-dev

2017-07-13 12:10:21 +00:00