| commit | 1324cb3561bfca8c33496bc642bf5af35155adf4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Dec 04 20:46:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 20:46:08 2014 +0000 |
| tree | f31d3f6e492992bbe24604c5dcb795f7d43ce335 | |
| parent | 6a93406b33bab8346b01aa3f0b8f2b1317d12d49 [diff] | |
| parent | b8fcb473e499ed160ee24cccdba73002a73977e3 [diff] |
am b8fcb473: (-s ours) am a37526a6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'b8fcb473e499ed160ee24cccdba73002a73977e3': Import translations. DO NOT MERGE