| commit | 2e34cd7eead78535529064113beb01921953e397 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 12:21:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:21:34 2015 +0000 |
| tree | 22a8c4fafef7f8b49e5f05a44b9a44ec88f01449 | |
| parent | 279784f79bf1b687bf2d1f6df835a1a193764732 [diff] | |
| parent | 62283023d4307e18e3742e8995b51ee24c15e038 [diff] |
am 62283023: (-s ours) am 762b4fd8: (-s ours) Import translations. DO NOT MERGE * commit '62283023d4307e18e3742e8995b51ee24c15e038':