| commit | 20bc621db07a8c868969295185f92b2204621c1b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 19 07:19:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 07:19:50 2014 +0000 |
| tree | 3adaee92a711e15e92093b3b6d9e5de3aa258de8 | |
| parent | c3d8e0e76ad1ef0039bbf14478be2fa06d5a9875 [diff] | |
| parent | 61c42768d1d54fa029f886f7a06372b63a8e6ba9 [diff] |
am 61c42768: (-s ours) am a1963671: (-s ours) am 82dd4420: (-s ours) am 64b61028: (-s ours) am 771a3a7d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '61c42768d1d54fa029f886f7a06372b63a8e6ba9':