commit | 0e71d19abb885d1998d74b8f3978df46851736d5 | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Mon Jul 02 14:12:46 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 02 14:12:46 2012 -0700 |
tree | f4750c69aab8b89ef332333b29b6b8f280a22dd0 | |
parent | e0a50cdd8181b459ec356fce96da28ea09aa1527 [diff] | |
parent | 82b141e26771f2f1fc16af12a9435f7a60091738 [diff] |
am 82b141e2: (-s ours) am c70ec659: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '82b141e26771f2f1fc16af12a9435f7a60091738': Import translations. DO NOT MERGE