tree 382e20f11f101b669b21329ce80701f5d9532acb
parent 512f563730d88f27e9e69e7ee2972253d643af13
parent 3bf6d4a5cf326824c44ffb3c1db97b72df989369
author Geoff Mendal <mendal@google.com> 1415835633 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415835633 +0000

am 3bf6d4a5: (-s ours) Import translations. DO NOT MERGE

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