| commit | fd4de96f4bdcf565e9c2cc03b2a902f191600091 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Jan 29 17:21:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 17:21:53 2015 +0000 |
| tree | ae7a55b0364a6a0e684db417d8b1b8bb6e154d96 | |
| parent | 8870e98d1a4bd582b5edbc67968e19d6d9751d57 [diff] | |
| parent | 3e075db78e3a8b02c87b899bb492121b66a07d9d [diff] |
am 3e075db7: (-s ours) am 01c2e28b: (-s ours) am 9206174e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '3e075db78e3a8b02c87b899bb492121b66a07d9d': Import translations. DO NOT MERGE