| commit | 4ea5268de0014cee69b8531c1eae2bf14dfeb8d7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Dec 09 22:22:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 09 22:22:48 2014 +0000 |
| tree | c7ae4626c6c4a15fd6290f4ff3b2c4b5a7caa9b0 | |
| parent | 6e0372380c9cca90f9ffc49a72ee45a1f32dcb8c [diff] | |
| parent | 6e5522ca814d1bd0882b57bbe5abe9c0af413bc6 [diff] |
am 6e5522ca: (-s ours) am a551f6c8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '6e5522ca814d1bd0882b57bbe5abe9c0af413bc6': Import translations. DO NOT MERGE