Alan Viverette 609b81c82d Merge "Dialog theme overlay should reset window fixed width and height" into nyc-dev ...

am: 94caf7a

* commit '94caf7a79743b3160d5a0dd4c623278e1319a03b':
  Dialog theme overlay should reset window fixed width and height

Change-Id: Ib0b4c5f417cbbbe323f1676d311bec648c175c12

2016-04-11 16:31:37 +00:00

..

java

Merge "Make additional IME Subtype ID persistent." into nyc-dev

2016-04-11 15:54:31 +00:00

jni

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

2016-04-08 13:31:42 -07:00

res

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

2016-04-11 16:31:37 +00:00

tests

Merge "Shift+Meta+Space should reverse-rotate subtypes." into nyc-dev

2016-04-11 05:32:05 +00:00