| commit | 13fb25b0d2c58073f032cd5854e17a3bd40ef5e0 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Nov 08 15:43:51 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 15:43:51 2012 -0800 |
| tree | 5dd7fb2b3a40ebe55a7adb1003bb501ea52b6d74 | |
| parent | 3e94c56215fa540ca722ab7b23710b82c08d20a4 [diff] | |
| parent | 5c89a59231e213a52a7557ee1362e093af1c0e2f [diff] |
am 5c89a592: am 4d0e5e0e: am db60b675: am fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '5c89a59231e213a52a7557ee1362e093af1c0e2f':