| commit | b6f0dcff71ee7b675edb65f0459f9e8c1a0b3574 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 20 09:57:22 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 20 09:57:22 2013 -0700 |
| tree | 9176f5f0d4e237876ed1ccb15cbad6e5ab5c2f8e | |
| parent | 03e9838357efd20ad6f7be9f182534da63abdcad [diff] | |
| parent | 26aa6e904c017abe9b7ce0773f5a353cabae93aa [diff] |
am 26aa6e90: (-s ours) am 8074862d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '26aa6e904c017abe9b7ce0773f5a353cabae93aa': Import translations. DO NOT MERGE