commit | 180cc012d35bfa4751f340f3d8e1010656a43bd8 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Nov 27 18:43:06 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 27 18:43:06 2012 -0800 |
tree | 6e3bfc17f236d606bbeb86aba312876eb2172e2f | |
parent | ffdc2c1750104dd67af1f1a0b3cb199760d599f8 [diff] | |
parent | 3ac8060c28dc93f3ec9feefe321d2c2e2f3b46db [diff] |
am 3ac8060c: (-s ours) am 9e2783ee: am 4df6c629: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev * commit '3ac8060c28dc93f3ec9feefe321d2c2e2f3b46db': Import translations. DO NOT MERGE