am 8f3c6521: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Tue, 7 Jan 2014 17:48:01 +0000 (09:48 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Jan 2014 17:48:01 +0000 (09:48 -0800)
commitc478796c0f999a4d91bfe3d605412e93dfa2868f
treea3aaf2d222ef5feebfcca9a81c7548a8964ec8da
parent5bafb68f64d87fecd4f871b2f27df5d037292f5f
parent8f3c652160e84e02f438a8dad72b9329d45b269f
am 8f3c6521: (-s ours) Import translations. DO NOT MERGE

* commit '8f3c652160e84e02f438a8dad72b9329d45b269f':
  Import translations. DO NOT MERGE