tree 3e27791185c513b3e17acaad5109774ef6f670a9
parent c1a063f33e210f981fad4c580a4efbe419889901
parent 21fd4ab93f1959ad5e2eb1d609d3ccc491615d15
author Baligh Uddin <baligh@google.com> 1349726584 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349726584 -0700

am 21fd4ab9: (-s ours) am 04220c34: Import translations. DO NOT MERGE

* commit '21fd4ab93f1959ad5e2eb1d609d3ccc491615d15':
  Import translations. DO NOT MERGE