Jiwen 'Steve' Cai 90d7153d0c Merge "ANativeWindow_toSurface implementation" into oc-dev am: 7e5d2c23a4 ...

am: 8671d4a328

Change-Id: If3751ba5c8cf6ba05f47e1b654559d9e4d8d54e9

2017-04-04 04:51:43 +00:00

..

java

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

2017-04-04 03:41:14 +00:00

jni

Merge "ANativeWindow_toSurface implementation" into oc-dev am: 7e5d2c23a4

2017-04-04 04:51:43 +00:00

proto/android

…

res

Merge "Added a whitelist for factory trust agents."

2017-04-04 02:13:18 +00:00

tests

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

2017-04-03 20:01:58 +00:00