| commit | c7dc7ef2dad957d8cf2be656fc3fe2a644ef3215 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Oct 19 20:25:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 19 20:25:20 2014 +0000 |
| tree | 7bf755b567e1471c47c697ff563f3700fb96a5f7 | |
| parent | a448796c98279c7722922a1cc441474b8f09bc4e [diff] | |
| parent | 515b888303c9932c3164537a1261a90520c3b3a8 [diff] |
am 515b8883: (-s ours) am 5466403f: (-s ours) am 475737db: (-s ours) am 425c06a0: (-s ours) am 4199680a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '515b888303c9932c3164537a1261a90520c3b3a8': Import translations. DO NOT MERGE