am 890cfb8a: (-s ours) am eb140c18: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 29 Sep 2014 21:00:24 +0000 (21:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Sep 2014 21:00:24 +0000 (21:00 +0000)
commitc056b4560e2cea69c985186174ba463fcb093642
treedc7a2015cc6946c61dc348ff1a2048ab26075b1e
parentc7f102af0b5025fc5ce0ba6690bfaafc49a44d42
parent890cfb8aa369ab5feb4f598d569a71e69ea28e50
am 890cfb8a: (-s ours) am eb140c18: (-s ours) Import translations. DO NOT MERGE

* commit '890cfb8aa369ab5feb4f598d569a71e69ea28e50':
  Import translations. DO NOT MERGE