tree af18068353722ace625e2c8345d3e2edeffec1af
parent c81b0617a6224e30e0294986c7d5f59542165591
parent 869df29e9125942bee858276698f02204b5273cf
author Baligh Uddin <baligh@google.com> 1404682915 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404682915 +0000

am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE

* commit '869df29e9125942bee858276698f02204b5273cf':
  Import translations. DO NOT MERGE