commit | 4942613ef837bb5379e9c3e3ad458bbe3d952729 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:12:14 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:12:14 2015 +0000 |
tree | 4ce3215693926ab94279f50f6c8520e4f05ca1fd | |
parent | b728a7c336045c9461b03de0bdbeb12b0408a6dd [diff] | |
parent | 516a91d8acd8ee23ae0296a51c521acaa561fed3 [diff] |
am 516a91d8: (-s ours) am c9e9eca8: (-s ours) am accfcfe3: (-s ours) am d28d0006: (-s ours) Import translations. DO NOT MERGE * commit '516a91d8acd8ee23ae0296a51c521acaa561fed3': Import translations. DO NOT MERGE