| commit | 6f249d9965f57c2b85d8c2f8d2abc98fc2a3a555 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Nov 22 11:12:23 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 22 11:12:23 2012 -0800 |
| tree | 19ed5303e1897f65e731fb002e3edd0fa5ed7198 | |
| parent | b9dda10b65f36b32ec405196afdf42feab039055 [diff] | |
| parent | d59c20621cfe53f888d1ac86fb69aaf1d8f2992d [diff] |
am d59c2062: (-s ours) am f43dc6a2: am f9eca9ec: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev * commit 'd59c20621cfe53f888d1ac86fb69aaf1d8f2992d': Import translations. DO NOT MERGE