commit | 0d77548cda02c3ab2e37d13cfc2edf57239c4372 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Dec 08 19:44:14 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 08 19:44:14 2014 +0000 |
tree | da4f54903ae15dc619bf7b88ac0c7ab3f373a987 | |
parent | ef10307e4a4942c5867ba696e12e13556ac7a716 [diff] | |
parent | 654d8805b21f5551d70ea92cfefa16b5440da886 [diff] |
am 654d8805: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '654d8805b21f5551d70ea92cfefa16b5440da886': Import translations. DO NOT MERGE