Philip P. Moltmann bd926258c2 resolve merge conflicts of 3c002e45dd to oc-dev-plus-aosp ...

am: d45000c1a9

Change-Id: I86966803e94f5e048d48898e7e43d15708c62254

2017-04-07 03:34:44 +00:00

..

java

resolve merge conflicts of 3c002e45dd to oc-dev-plus-aosp

2017-04-07 03:34:44 +00:00

jni

Merge "SurfaceControl: Crash due to invalid JNI cast" into oc-dev

2017-04-06 23:35:38 +00:00

proto/android

CEC: Revisit the behavior of HDMI_SYSTEM_AUDIO_ENABLED

2017-03-13 20:00:58 +09:00

res

Merge "Revise Accessibility button chooser intent/permissions" into oc-dev am: ecb5b5ccc3

2017-04-07 02:52:50 +00:00

tests

Clone BackupManagerService and make Trampoline aware of the clone.

2017-04-06 12:28:13 +01:00