Jiwen 'Steve' Cai 8671d4a328 Merge "ANativeWindow_toSurface implementation" into oc-dev ...

am: 7e5d2c23a4

Change-Id: I43258cd59a653fb6938a96d27579bf48d92a3195

2017-04-04 04:41:42 +00:00

..

java

Merge "Themes: Apply themes to system_server safely" into oc-dev

2017-04-04 03:33:42 +00:00

jni

Merge "ANativeWindow_toSurface implementation" into oc-dev

2017-04-04 04:30:15 +00:00

proto/android

CEC: Revisit the behavior of HDMI_SYSTEM_AUDIO_ENABLED

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

res

Merge "Expose framework activities to Instant Apps" into oc-dev

2017-04-03 23:58:25 +00:00

tests

Merge "Revert "Push chooser targets to the shortcut manager."" into oc-dev

2017-04-03 19:54:24 +00:00