commit | 8b6b589dbd43bd30c7a52ad5503a0c6c5beb09b2 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Oct 14 12:49:34 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 12:49:34 2015 +0000 |
tree | 048511efa39272cfca4f5dc69e6f77339fe11bb2 | |
parent | 974dfc1fbd8cedae3c3ff48c35082ee7efa90a3a [diff] | |
parent | cec2a65a98161c6c69e373647f03745c59246097 [diff] |
am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE * commit 'cec2a65a98161c6c69e373647f03745c59246097': Import translations. DO NOT MERGE