commit | 4b46c2c121eb66de65a9ab31afafd7e677bc6217 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Oct 04 22:33:06 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 04 22:33:06 2012 -0700 |
tree | 3d05633149dde8a6a0907ec66827b19f3935b40b | |
parent | ca099a39a0ab330f95f84a3f09f30db0ddf570cd [diff] | |
parent | 2087e2961d41122360df4e0104c49bbc42c0f118 [diff] |
am 2087e296: (-s ours) am a7950f64: am 47417ec1: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '2087e2961d41122360df4e0104c49bbc42c0f118': Import translations. DO NOT MERGE