tree d14ba40cf46738e40d7947a078dd587dfb440fba
parent 4d3109859d5a8716f5701144696c46ce72633e84
parent 0f041b2ebbb6fbd84803e818f065db9d0e299823
author Geoff Mendal <mendal@google.com> 1436998263 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436998263 +0000

am 0f041b2e: (-s ours) am 9e6f5d27: (-s ours) am c7386917: (-s ours) Import translations. DO NOT MERGE

* commit '0f041b2ebbb6fbd84803e818f065db9d0e299823':
  Import translations. DO NOT MERGE