Vladislav Kaznacheev 258fbcb0b8 Merge "Add wallpaper input consumer to WindowManagerService" into nyc-dev am: b7d08c3 ...

am: 72e7feb

* commit '72e7feb221c58536a4a4e5116fa7bc4f5ffee8b0':
  Add wallpaper input consumer to WindowManagerService

Change-Id: I89a9bbf331bbd02bc53a3b47b4157d9e4904964c

2016-03-31 18:49:44 +00:00

..

java

Merge "Add wallpaper input consumer to WindowManagerService" into nyc-dev am: b7d08c3

2016-03-31 18:49:44 +00:00

jni

Merge "Add a callback for rendernode parentcount=0" into nyc-dev am: bbb4c2e

2016-03-31 18:34:35 +00:00

res

Merge "Remove "Other keyboards" from IME switcher dialog." into nyc-dev am: 4f172d8

2016-03-31 06:22:31 +00:00

tests

Merge "Merge commit \'1a510a3c5ce1a7d8ef9817ad7da4b06b9844383f\' into manual_merge_1a510a3" into nyc-dev-plus-aosp

2016-03-31 18:08:07 +00:00