tree cedcdc410c4f72dbeb8e39b89ff3ddc105302b42
parent bce70a1f9b852c857e1820d22324f60ac60862db
parent c2d8a52393941f7019ce81c3a3a523871bd8680f
author Geoff Mendal <mendal@google.com> 1438448627 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438448627 +0000

am c2d8a523: (-s ours) am 5d4bd09d: (-s ours) am bd24631d: (-s ours) Import translations. DO NOT MERGE

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