| commit | 889ce2281f778bb2ab44f6b7a2b197196d68d285 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Dec 17 14:42:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 17 14:42:24 2014 +0000 |
| tree | 0c650edf35d6db3c1c29012effa6e70d3e15aba2 | |
| parent | 1ecc00d870e7119a3524ab6b9d16535e41cc3f07 [diff] | |
| parent | c5fdbe8271f6f34baa27521d6146fbc6e7429a58 [diff] |
am c5fdbe82: (-s ours) am 3a92fb26: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'c5fdbe8271f6f34baa27521d6146fbc6e7429a58': Import translations. DO NOT MERGE