tree e62c67bbcb3941140c95bc284aa7e6d508759b0b
parent de93b299ca3112ca23b746f286df48bf4c9c43a1
parent 0038e433bff1859282911132459c6165a51852bb
author Baligh Uddin <baligh@google.com> 1383695394 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383695394 -0800

am 0038e433: (-s ours) am 25ee68ea: (-s ours) Import translations. DO NOT MERGE

* commit '0038e433bff1859282911132459c6165a51852bb':
  Import translations. DO NOT MERGE