Geoff Mendal 12647d923d Merge "Import translations. DO NOT MERGE"

2014-12-15 18:23:04 +00:00

..

java

Merge "Implemented backup and restore for account sync settings."

2014-12-15 18:22:46 +00:00

jni

am 20c906a8: am a101befb: Merge "Lose some unnecessary JNI from the zygote."

2014-12-12 23:38:23 +00:00

res

Import translations. DO NOT MERGE

2014-12-15 10:09:53 -08:00

tests

Merge "Allow compilation with Jack."

2014-12-04 09:26:54 +00:00