| commit | 81adf9d9030c1a57c46c83238ef54117417ccaee | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Aug 22 16:52:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 22 16:52:11 2014 +0000 |
| tree | 63266b7648372e3d504f8dd9b86f1c391230f24b | |
| parent | 389e39146be4ad16c0ea62a8e7df5ddb6ce23de2 [diff] | |
| parent | 3305a0b5e7d4bd76fca859060c6407667a27c273 [diff] |
am 33a3d29f: (-s ours) am 37d2c978: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '33a3d29f4340d1d338b77ca053afeec43de15e1d': Import translations. DO NOT MERGE