Dianne Hackborn 035045f8bb Merge "Add version code constant for JB MR2." into jb-mr2-dev

2013-02-25 23:56:38 +00:00

..

java

Merge "Add version code constant for JB MR2." into jb-mr2-dev

2013-02-25 23:56:38 +00:00

jni

am 92f3e9a1: am e88c0d9e: Merge "Recognize odex files in memory accounting."

2013-02-25 18:09:55 +00:00

res

Merge "Import translations. DO NOT MERGE"

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

tests

Merge "Clean up scan handling"

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