am 3da05cbf: (-s ours) am 0c7b1b05: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Sun, 17 Aug 2014 14:23:47 +0000 (14:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 17 Aug 2014 14:23:47 +0000 (14:23 +0000)
commit50391c0e2bfd746cff84d23a430d213c8ead92f3
treef0dc34a411a6160bdb2fc7c0c5abc98e88bc2e47
parent4640ee868357d9c8d184a6448cd92cb5dcd24962
parent3da05cbfbad836707db214ee9a5346527fb49373
am 3da05cbf: (-s ours) am 0c7b1b05: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '3da05cbfbad836707db214ee9a5346527fb49373':
  Import translations. DO NOT MERGE