tree 58406ff0fbe31d94e376ebe2dd9e439168f15165
parent d9ad7380b42ba26922785f8a56968bf29854e61f
parent bc2881431bfaaa6251a7e3ae7bbb053c14f7e5ed
author Geoff Mendal <mendal@google.com> 1423773029 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423773029 +0000

am bc288143: (-s ours) Import translations. DO NOT MERGE

* commit 'bc2881431bfaaa6251a7e3ae7bbb053c14f7e5ed':
  Import translations. DO NOT MERGE