am 2fed236f: (-s ours) am eb1300b1: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Thu, 17 Jul 2014 18:19:10 +0000 (18:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Jul 2014 18:19:10 +0000 (18:19 +0000)
commit8c22b24a8ed2e38f3d27ec962f312059dab78dbb
tree808e69349393bcdecb7ba067b5843c3fe28f5d4a
parent6e64e6c5ca7693bebd16aa98a0bc85c8aafbcd4a
parent2fed236fda0f2b5afdc4ddcb728fb86561fc0fd7
am 2fed236f: (-s ours) am eb1300b1: (-s ours) Import translations. DO NOT MERGE

* commit '2fed236fda0f2b5afdc4ddcb728fb86561fc0fd7':
  Import translations. DO NOT MERGE