commit | d8812331f475b08eee091324073b77923100aa2b | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 14:40:31 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 14:40:31 2015 +0000 |
tree | 24c7e0de5a5e0a04dd4f08b0b631de875e4afe9a | |
parent | 2c2d67f8ab49bff97c75ebcf9e346207fb652353 [diff] | |
parent | 9ef86dfd3f6a7968efac8442916e9e18f40605dc [diff] |
am 9ef86dfd: (-s ours) am ee578f85: (-s ours) am 1dadbb28: (-s ours) am 1e6a4174: (-s ours) Import translations. DO NOT MERGE * commit '9ef86dfd3f6a7968efac8442916e9e18f40605dc': Import translations. DO NOT MERGE