| commit | 41398aa48ae0b2290b5fde73e30712b8b83679d4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Dec 04 20:45:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 20:45:12 2014 +0000 |
| tree | 2281caadccd72129de9f88b3d3cc088967711447 | |
| parent | a0e6d49c3bdf5415954f40eec28f8280467cbf8f [diff] | |
| parent | a79eea5c9722d1ee23c7b220f4c29815a1c6c0bd [diff] |
am a79eea5c: (-s ours) am 3b05d2bd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'a79eea5c9722d1ee23c7b220f4c29815a1c6c0bd': Import translations. DO NOT MERGE