commit | d326305b2567ef3ca9bb56205301b9e17631560d | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jun 01 17:09:45 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:09:45 2015 +0000 |
tree | 2502a323c2824f0820bfe40bd3a1d3c076341e0a | |
parent | aeafd51c43435f12a7fbd3f35356bd7d1b3c9bb7 [diff] | |
parent | 78cd8ad5e787c3a8e07dc698c1d7a89f6ed76f26 [diff] |
am 78cd8ad5: (-s ours) am 699e129c: (-s ours) Import translations. DO NOT MERGE * commit '78cd8ad5e787c3a8e07dc698c1d7a89f6ed76f26': Import translations. DO NOT MERGE