| commit | 9d695da8851298858c1280bf7fb7b44f78b501a2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Feb 25 17:11:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 25 17:11:54 2015 +0000 |
| tree | 6182b2630b2254a6ad010ecb6a77aa8cc5fcf385 | |
| parent | dd535604fc1e77da28a259a9e9e073efa5618f17 [diff] | |
| parent | ce64b99e4478f047ff871078e2ad64d4c4818529 [diff] |
am ce64b99e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit 'ce64b99e4478f047ff871078e2ad64d4c4818529': Import translations. DO NOT MERGE