Jeff Sharkey ebf8c5d3ee am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1 ...

* commit 'd968670d8369e5d92ba9b7a45b3804d692a05a4e':
  Conservatively trim data usage stats.

2011-11-15 09:25:40 -08:00

..

java

am 9058435d: Merge "Fix races when content providers are acquired and released." into ics-mr1

2011-11-15 09:25:18 -08:00

jni

am 9d66da8a: Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1

2011-11-14 12:28:09 -08:00

res

am 539bcca9: Merge "Fix bug 5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1

2011-11-15 09:25:27 -08:00

tests

Merge "Conservatively trim data usage stats." into ics-mr1

2011-11-14 23:37:17 -08:00