Baligh Uddin cb81d805ff Merge "Import translations. DO NOT MERGE"

2013-03-20 18:10:34 +00:00

..

java

am c7edf2b0: am 0a4962ad: Merge "make Surface.java internal state thread-safe" into jb-mr2-dev

2013-03-20 00:54:40 +00:00

jni

make Surface.java internal state thread-safe

2013-03-18 20:29:18 -07:00

res

Merge "Import translations. DO NOT MERGE"

2013-03-20 18:10:34 +00:00

tests

am c9fe40ea: am 71558f1f: Merge "Fix times in debugging output to use H rather than k."

2013-03-19 10:13:34 -07:00