| commit | e57af7fd9663adbf8159cd35f50e96f36b2f47ea | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 14:18:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:18:50 2015 +0000 |
| tree | 84230245b6d0620425180d5fab12ff558de999ab | |
| parent | 8676633cbda9a649d1a114c85bf5bd0a0192c569 [diff] | |
| parent | 2fec4a91e27e424403e92595d752123cb81e56f9 [diff] |
am 2fec4a91: (-s ours) am a5f1be6f: (-s ours) am 97e3b5fc: (-s ours) Import translations. DO NOT MERGE * commit '2fec4a91e27e424403e92595d752123cb81e56f9':