tree 2f08df22f31e3a6cac5d01c0c56244f65e422e21
parent bb0b55ccade4cbe9d122ca63b6aa893433845f73
parent 71a80d9ffd76954a3e96ef1e8690a8645575ee18
author Geoff Mendal <mendal@google.com> 1440674333 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440674333 +0000

am 71a80d9f: (-s ours) am baf687ff: (-s ours) Import translations. DO NOT MERGE

* commit '71a80d9ffd76954a3e96ef1e8690a8645575ee18':