am be00864e: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Sat, 14 Sep 2013 20:55:59 +0000 (13:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 14 Sep 2013 20:55:59 +0000 (13:55 -0700)
commitf6bf890dda4b3467805d154f5a7d2e1c68ddf3f8
tree82f3f3e370bd6d9c4fac33e87fd11b7f4fb4087d
parente3f38760b1212c70d61a42df67419a7ef78862a2
parentbe00864e2f3a73a7e7dbc6d435094e25e0e7cc40
am be00864e: (-s ours) Import translations. DO NOT MERGE

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