tree 88d2192a580a8264fcd6cd3dbd83b211376730c2
parent a2880fdc5d67a32b1234b130a45c0a008264aef7
parent b21d4e936d7edddf61a98fbe941d41293e8f3021
author Baligh Uddin <baligh@google.com> 1355189861 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355189861 -0800

am b21d4e93: am 45f73b86: Import translations. DO NOT MERGE

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