Alan Viverette aed12685b0 am a19f0577: am 8ccf071a: Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev ...

* commit 'a19f057792e21879f0f071f361c13bc9e41f6a9d':
  Move default token handling into WindowManagerImpl

2014-11-21 01:38:26 +00:00

..

java

am a19f0577: am 8ccf071a: Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev

2014-11-21 01:38:26 +00:00

jni

resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp

2014-11-20 15:41:25 -08:00

res

am 05275a2c: am 93da37a0: Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev

2014-11-21 01:38:21 +00:00

tests

am 648f8106: am db3d76ab: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev

2014-11-13 00:40:28 +00:00