commit | 00e2afb7cf26b231143867e7292a29391c6cfe6e | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Dec 17 14:57:55 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 17 14:57:55 2014 +0000 |
tree | c4c31a48a3631eb8b2c58006b641ac7d9eea9f40 | |
parent | 934f9881179158e03774fe1ec70734523d0decaf [diff] | |
parent | 6641a0b5a21c55d1a69cf19393380517ae2a1e95 [diff] |
am 6641a0b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '6641a0b5a21c55d1a69cf19393380517ae2a1e95': Import translations. DO NOT MERGE