| commit | 160dc0f298c870c701e663491c01ba8ed6bc7c4b | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu Feb 02 13:54:27 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 02 13:54:27 2012 -0800 |
| tree | b78633fd54ee27cb2126a154df463c29439663a9 | |
| parent | 8a7a645ff7d7f99d6a8721af2ffc09e151abf8ba [diff] | |
| parent | ce4bce00eb0ef282ebea715dc7cdc7fafce3f84b [diff] |
am ce4bce00: am 201a77ea: (-s ours) am 940f2a74: (-s ours) am 67a50f99: Import translations. DO NOT MERGE * commit 'ce4bce00eb0ef282ebea715dc7cdc7fafce3f84b': Import translations. DO NOT MERGE