| commit | 3e37b22fa7287c05ca71ba1a5753d630bc6626b4 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Oct 16 22:34:35 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 16 22:34:35 2012 -0700 |
| tree | 51ed09d778323103ba8332b4580c4b60d011c183 | |
| parent | c1b5108bde3fcd38dce6bc038fb69d69bacdbee5 [diff] | |
| parent | ee4b3e64ee95bd17c81cdd87a0de60ebbbf1ebe9 [diff] |
am ee4b3e64: (-s ours) am e5fd5ea5: am dbba676c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'ee4b3e64ee95bd17c81cdd87a0de60ebbbf1ebe9': Import translations. DO NOT MERGE