Alan Viverette 9cd773733c Merge "Always account for divider height when calculating list height" into nyc-dev am: fab88ea am: 958f6002 ...

am: de613b2

* commit 'de613b2860b9ba3c916061876a3bf2fdd8123662':
  Always account for divider height when calculating list height

Change-Id: I1abfe8823e029d3c52c629a32b351f6b9985d134

2016-04-27 23:25:31 +00:00

..

java

Merge "Always account for divider height when calculating list height" into nyc-dev am: fab88ea am: 958f6002

2016-04-27 23:25:31 +00:00

jni

Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115

2016-04-27 22:14:50 +00:00

res

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

2016-04-27 19:58:01 +00:00

tests

Merge "Ensure local settings caches are not stale" into nyc-dev am: f71d7fe am: d4bc15b

2016-04-26 18:54:37 +00:00