Adrian Roos 9dde6d3378 Merge "Partial revert of c1a80b08f08cfb038625cec537390705d16db3f5" into nyc-dev ...

am: 9a5a6eb

* commit '9a5a6ebcda618c72d80f11370e27375cffb62efa':
  Partial revert of c1a80b08f0

Change-Id: Ib08281a5b5714c4d7f65782f7eb093cfc84e8345

2016-04-15 00:04:56 +00:00

..

java

Merge "Revert "Optimize ResTable::getLocales() to improve bindApplication performance"" into nyc-dev

2016-04-14 23:58:22 +00:00

jni

Merge "Revert "Revert "Make stopped state a first-class thing""" into nyc-dev

2016-04-14 17:47:40 +00:00

res

Merge "Partial revert of c1a80b08f08cfb038625cec537390705d16db3f5" into nyc-dev

2016-04-15 00:04:56 +00:00

tests

Merge "Add some tests for procstats, and fix some bugs that the tests uncovered." into nyc-dev

2016-04-12 22:22:52 +00:00