tree c0d2e43c958d81c1f65be01016e8ddfa92b1a923
parent f9dd0cb16c21e858541ab0fc28ce09ce6e589bb0
parent aa92bb8dc3327e6e9be880fd8389da8497a0e06c
author Geoff Mendal <mendal@google.com> 1441197721 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441197721 +0000

am aa92bb8d: (-s ours) am b939039a: (-s ours) Import translations. DO NOT MERGE

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