| commit | d4f3069c9dcadcefd4a5b007b3e75662f9385132 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Nov 29 21:07:24 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 21:07:24 2012 -0800 |
| tree | 7ea5e751b6a36a925a8c256bd5bba223769b1445 | |
| parent | 4fc2497f29ab9f9154f7428df4cde2101f281eb7 [diff] | |
| parent | 4668391b278efcbcd8132f7c900aae82d6f74ea8 [diff] |
am 4668391b: (-s ours) am 497a40e0: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '4668391b278efcbcd8132f7c900aae82d6f74ea8': Import translations. DO NOT MERGE