am 5bafb68f: (-s ours) am fc6d1ead: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Fri, 27 Dec 2013 04:00:36 +0000 (20:00 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 27 Dec 2013 04:00:36 +0000 (20:00 -0800)
commitcd3a74b38ec9bb2b6fb20184c3be5abc10366a6a
tree8acc285e3c0688b50840bb525668609eb7ff4cf7
parent4ff1765c9660b2e1288560e94b7a208170bdd810
parent5bafb68f64d87fecd4f871b2f27df5d037292f5f
am 5bafb68f: (-s ours) am fc6d1ead: (-s ours) Import translations. DO NOT MERGE

* commit '5bafb68f64d87fecd4f871b2f27df5d037292f5f':
  Import translations. DO NOT MERGE