Eric Fischer ebeb45bf1f Merge "Import translations. DO NOT MERGE"

2012-06-13 12:32:56 -07:00

..

java

am 06d6204a: am d772c487: Merge "Fix attachFunctor path to ignore delay" into jb-dev

2012-06-13 10:49:02 -07:00

jni

am b8b29fa7: am fdcac45b: Merge "Print extended SQLite error code." into jb-dev

2012-06-12 16:13:41 -07:00

res

Merge "Import translations. DO NOT MERGE"

2012-06-13 12:32:56 -07:00

tests

am d26f7139: Merge "resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp" into jb-dev-plus-aosp

2012-06-08 14:08:28 -07:00