| commit | cb93f96f15e982b400a0f6c1c05c63bc97b59b52 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 19 07:19:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 07:19:51 2014 +0000 |
| tree | 3adaee92a711e15e92093b3b6d9e5de3aa258de8 | |
| parent | 20bc621db07a8c868969295185f92b2204621c1b [diff] | |
| parent | 65581fac70f35ffd7ea7443c8afc15ffb141346d [diff] |
am 65581fac: (-s ours) am 51de2657: (-s ours) am 30cfe2fd: (-s ours) am 5c714f49: (-s ours) am aaddee70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '65581fac70f35ffd7ea7443c8afc15ffb141346d':