| commit | 2f19b0b5c8137609c64733bc6d94662143664512 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Jan 29 17:21:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 17:21:54 2015 +0000 |
| tree | ae7a55b0364a6a0e684db417d8b1b8bb6e154d96 | |
| parent | fd4de96f4bdcf565e9c2cc03b2a902f191600091 [diff] | |
| parent | 7fbb4a91f80a71872e243401b577a8896131e58b [diff] |
am 7fbb4a91: (-s ours) am c84e354c: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '7fbb4a91f80a71872e243401b577a8896131e58b': Import translations. DO NOT MERGE