Android 6.0.1 release 24
am 63215b6c: (-s ours) am 946371f8: (-s ours) Import translations. DO NOT MERGE

* commit '63215b6c15b40e4e2bb0aee2b8ecb814f5eedc31':
  Import translations. DO NOT MERGE