Daniel Nishi 5da495ee25 Merge "Add a flag to toggle the automatic storage manager on and off." into nyc-mr1-dev am: 9746deefbb ...

am: 15d6c4bf7c

* commit '15d6c4bf7c5feb1e77a50ae014e3e2c27740c898':
  Add a flag to toggle the automatic storage manager on and off.

Change-Id: I39652f61fc252bfd7a50b801ea46d7d00c60e83b

2016-05-25 00:24:51 +00:00

..

java

Merge "Add a flag to toggle the automatic storage manager on and off." into nyc-mr1-dev am: 9746deefbb

2016-05-25 00:24:51 +00:00

jni

Merge "Merge "Fix misc-macro-parentheses warnings in audio media jni." am: 9ecb10d1b5 am: ca3f49d594" into nyc-dev-plus-aosp am: a90bd3a04a

2016-05-24 19:30:09 +00:00

res

Merge "Children should have backgrounds" into nyc-dev am: 31e49b0964 am: 12021f5020

2016-05-24 21:19:27 +00:00

tests

Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb am: 5e106dea45

2016-05-24 21:47:36 +00:00