| commit | 15fb33165abe5bd65a9a3eeca63edb976329258d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Nov 16 10:37:02 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 16 10:37:02 2012 -0800 |
| tree | b6f5c16672609c4e25cb5bf5ca0a71d432f0dd3c | |
| parent | e45edaffa1041bb4f3a679deed32eb2c3de40197 [diff] | |
| parent | e872b738e823fb91e3010b65976e8deab5bb1ea1 [diff] |
am e872b738: (-s ours) am a3a2c6a9: am ecc2bcb5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev * commit 'e872b738e823fb91e3010b65976e8deab5bb1ea1': Import translations. DO NOT MERGE