tree 308bfe160bdd2b8f1774e6606c2f4a2d2a9732cd
parent 46fadb5f585a2ee447bc6997216d3db70571217c
parent 13ff526ba803087944fc857ca2dfb3982ff25a65
author Geoff Mendal <mendal@google.com> 1415049102 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415049102 +0000

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

* commit '13ff526ba803087944fc857ca2dfb3982ff25a65':
  Import translations. DO NOT MERGE