tree 0c17ae1eb412190fd1dc9d24bffac42e32a7b5bc
parent f132e7ef0ece5a31595153ec71ef539b4c40f706
parent ce2b1e8cfaa67f27502d4db837d197409453aae4
author Geoff Mendal <mendal@google.com> 1412623724 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412623724 +0000

am ce2b1e8c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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