| commit | 68068f45322920385e74881202d73857162e2cac | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 18:58:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 18:58:04 2014 +0000 |
| tree | a31425fe12dc1d3f5bc9b777b4b17bac2be655ec | |
| parent | 83a48b670a82c86cc6eca31797b1a6398f29ff01 [diff] | |
| parent | 7a6396ce19e7fee30589c65c5bedecf86b752904 [diff] |
am 2044cfb9: (-s ours) am dcefa462: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '2044cfb993c455163fc9c9257421642be808208b': Import translations. DO NOT MERGE