am ad93ffcb: (-s ours) am 5323c2d2: (-s ours) am d1fbac1a: (-s ours) am 06d3867b...
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)
commit6e64e6c5ca7693bebd16aa98a0bc85c8aafbcd4a
tree808e69349393bcdecb7ba067b5843c3fe28f5d4a
parent3da24143e3d8f174c56a9f3feb621bd313a01f7a
parentad93ffcb74a82aea20990def7bc7859b6c78910c
am ad93ffcb: (-s ours) am 5323c2d2: (-s ours) am d1fbac1a: (-s ours) am 06d3867b: (-s ours) Import translations. DO NOT MERGE

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