am 21c12e8c: (-s ours) am 54fbb3a6: (-s ours) am e8137079: (-s ours) Import translati...
authorBaligh Uddin <baligh@google.com>
Sun, 6 Jul 2014 22:07:35 +0000 (22:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 6 Jul 2014 22:07:35 +0000 (22:07 +0000)
commit3da24143e3d8f174c56a9f3feb621bd313a01f7a
tree808e69349393bcdecb7ba067b5843c3fe28f5d4a
parent33762c3ded9fdea6ea05fc3ab784a00879c11aa7
parent21c12e8c01d9c9e8f3fefc9a7aa337d3036bac85
am 21c12e8c: (-s ours) am 54fbb3a6: (-s ours) am e8137079: (-s ours) Import translations. DO NOT MERGE

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