| commit | bb2eb555f52c51a3eac1da5b3649d8480a9d75e2 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed May 14 18:50:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 18:50:59 2014 +0000 |
| tree | 09ed02b071a412696b5f07c004edb76305233717 | |
| parent | 3e6f6667d1012a4db35a0992551bdfc962abd9d4 [diff] | |
| parent | a8f48bf6a30a1f161e2292edff038c19691defe6 [diff] |
am 23d627a3: (-s ours) am b612ff49: (-s ours) am a52b892e: (-s ours) am a49b916a: (-s ours) am d838ebc6: (-s ours) am bc01c0e8: (-s ours) am 45ab8271: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '23d627a3050506c3139f4bd2a439aa607196a6b2':