| commit | 261622aa1e742ec58d1f5a24341e0dd64c750326 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 19 07:19:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 07:19:53 2014 +0000 |
| tree | 3adaee92a711e15e92093b3b6d9e5de3aa258de8 | |
| parent | d3cfe5a78a0318544136dd8587c32c1bdbe26ab0 [diff] | |
| parent | 81a419478548063ef5245c377ad4a7549108049f [diff] |
am 81a41947: (-s ours) am d4ce00d1: (-s ours) am d14ce20c: (-s ours) am 64334e4f: (-s ours) am 81c1daa9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '81a419478548063ef5245c377ad4a7549108049f':