| commit | ff61c78c38af7d7f23a2068c978906c9b1aa151e | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed May 14 18:50:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 18:50:58 2014 +0000 |
| tree | 09ed02b071a412696b5f07c004edb76305233717 | |
| parent | a359251e882337700b4bfc7e2f606ed020550e1b [diff] | |
| parent | 2e8dbd338eb4b327a8adca8400ded3de909e7c31 [diff] |
am 659699f9: (-s ours) am 104c5968: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '659699f95c67ef38ebf74edafac97e6affea9d16':