Alan Viverette 091f7d75bc Merge "Dialog theme overlay should reset window fixed width and height" into nyc-dev am: 94caf7a ...

am: 609b81c

* commit '609b81c82d9b91541685640d80ae21e43e65a025':
  Dialog theme overlay should reset window fixed width and height

Change-Id: I6cd089ced64ab22ff8cf59f6ddede1098e7310fc

2016-04-11 16:36:28 +00:00

..

java

Merge "Make additional IME Subtype ID persistent." into nyc-dev am: 063fe65

2016-04-11 16:01:36 +00:00

jni

resolve merge conflicts of 0e89f98 to nyc-dev-plus-aosp

2016-04-08 20:48:35 +00:00

res

Merge "Dialog theme overlay should reset window fixed width and height" into nyc-dev am: 94caf7a

2016-04-11 16:36:28 +00:00

tests

Merge "Shift+Meta+Space should reverse-rotate subtypes." into nyc-dev am: 270fe5d

2016-04-11 06:43:07 +00:00