Chong Zhang 426fdee24e Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev am: b1e24209f1 ...

am: 2f2af39911

* commit '2f2af39911976974177e92099e27c10fe93beddd':
  Fix scroll amount calculation in ViewRootImpl

Change-Id: I145857ecc2a07ad1b7bb80334ff81c2d990bb199

2016-06-02 21:11:53 +00:00

..

java

Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev am: b1e24209f1

2016-06-02 21:11:53 +00:00

jni

Merge "Copy native tree\'s property when mutate vector drawable" into nyc-dev

2016-05-27 22:22:14 +00:00

res

Merge "Changing user switching messages for demo mode" into nyc-mr1-dev

2016-06-02 18:50:51 +00:00

tests

Merge "Fix crash with intent-less actions" into nyc-dev am: ac2b44f502

2016-05-31 21:08:54 +00:00