tree b39889c84624fff10fb4c8b878ecfaffee4aef7a
parent 39bfdb6ba83203eca02b7bc133632eb9b53fc2e4
parent 3adaf7803bff010e8df0c087e362032e3d8c74e5
author Geoff Mendal <mendal@google.com> 1423769449 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423769449 +0000

am 3adaf780: (-s ours) am 02ef7720: (-s ours) Import translations. DO NOT MERGE

* commit '3adaf7803bff010e8df0c087e362032e3d8c74e5':
  Import translations. DO NOT MERGE