Baligh Uddin 9f435f4be0 Merge "Import translations. DO NOT MERGE"

2012-08-10 15:52:02 -07:00

..

java

am 5681861a: am c47f80f1: Merge "Don\'t assume a default of \'false\' for TwoStatePreference" into jb-mr1-dev

2012-08-10 14:44:25 -07:00

jni

am af4fa8d7: am 8046b5e0: Merge "UsbRequest: set ByteBuffer.position() upon success." into jb-mr1-dev

2012-08-09 16:14:13 -07:00

res

Merge "Import translations. DO NOT MERGE"

2012-08-10 15:52:02 -07:00

tests

am 194da0b8: am a39fdd11: Merge "Fix AccountManagerServiceTest" into jb-dev

2012-07-31 12:36:35 -07:00