tree fc5b0832857d1730a86ead181d8984eab179b046
parent 86d460b31a610de79495329a5c6ddfbbd61ac05e
parent deb646333a8d2acb36d1a39b926af1d773a60da7
author Qiwen Zhao <zhao@google.com> 1421877767 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421877767 +0000

am deb64633: (-s ours) Import translations. DO NOT MERGE - Update prebuilt SDK to LMY21

* commit 'deb646333a8d2acb36d1a39b926af1d773a60da7':
  Import translations. DO NOT MERGE - Update prebuilt SDK to LMY21