| commit | 5c5a7263bb96d71a9cd19d07c5d613e2913e4bb7 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Aug 26 15:17:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 26 15:17:31 2013 -0700 |
| tree | 0b1d1e4f769bf262353ee15629c8de1e6b1f21f5 | |
| parent | 38164b2b9ca1a0be265f81a5d69c007248b61b7d [diff] | |
| parent | a45e031df508b8ae8603f1c0ea087da7d4d2c433 [diff] |
am a45e031d: (-s ours) am 02948166: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'a45e031df508b8ae8603f1c0ea087da7d4d2c433': Import translations. DO NOT MERGE