Elliott Hughes da30b545f9 Merge "Fix typo."

2014-12-09 16:02:57 +00:00

..

java

Merge "Fix typo."

2014-12-09 16:02:57 +00:00

jni

Merge "Add more -d dalvik details to dumpsys"

2014-12-09 02:05:45 +00:00

res

Import translations. DO NOT MERGE

2014-10-30 15:17:39 -07:00

tests

Merge "Add tests about annotations and enum."

2014-12-01 09:30:59 +00:00