Adam Lesinski b188c93a45 Merge "Themes: Apply themes to system_server safely" into oc-dev ...

am: a52fc49845

Change-Id: I85c390f99600d4f6cf75c9b3a4b1c39e7b874335

2017-04-04 03:33: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 "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE." into oc-dev

2017-04-04 02:59:36 +00:00

proto/android

…

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