Ian Rogers 0664d95090 am 0493d799: am 75dcb333: am 545464df: Merge "Deprecate and document memory allocation counting." ...

* commit '0493d7997e22376524d707e407662d0f98f40c47':
  Deprecate and document memory allocation counting.

2013-02-27 23:22:44 +00:00

..

java

am 0493d799: am 75dcb333: am 545464df: Merge "Deprecate and document memory allocation counting."

2013-02-27 23:22:44 +00:00

jni

Merge "Camera and MediaRecorder: Support AppOps" into jb-mr2-dev

2013-02-26 01:36:05 +00:00

res

Import translations. DO NOT MERGE

2013-02-27 09:13:55 -08:00

tests

Merge "Clean up scan handling"

2013-02-22 18:40:24 +00:00