tree c560330f63f0d44302791c6c42268f18c5732def
parent 745707f8cd4d4d9b16794b2e5139a09a5bb2776e
parent 378ba42a8aa11d7fd37e39c1a04ebb2ec089e6da
author Geoff Mendal <mendal@google.com> 1439388080 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439388080 +0000

am 378ba42a: (-s ours) am dfe2ed8f: (-s ours) Import translations. DO NOT MERGE

* commit '378ba42a8aa11d7fd37e39c1a04ebb2ec089e6da':
  Import translations. DO NOT MERGE