Doris Liu 494e6b6e5e Merge "Count native allocation for VD against Java heap" into nyc-dev am: 6543533f29 am: 031fc2de5c ...

am: 5b41913606

* commit '5b41913606b4a134b2e852b8e1dceb6d90f10513':
  Count native allocation for VD against Java heap

Change-Id: Ib18ac599272de1cd9177d841e3146d3d67379c5d

2016-05-03 17:01:19 +00:00

..

java

Merge "Merge "Merge "ShortcutManager: finishing touches" into nyc-dev am: 7d164d35a4" into nyc-mr1-dev am: 59cfcb502d am: 2c0af8597d"

2016-05-03 16:46:58 +00:00

jni

Merge "Count native allocation for VD against Java heap" into nyc-dev am: 6543533f29 am: 031fc2de5c

2016-05-03 17:01:19 +00:00

res

Merge "Merge "ShortcutManager: finishing touches" into nyc-dev am: 7d164d35a4" into nyc-mr1-dev am: 59cfcb502d

2016-05-03 16:45:09 +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