Android 6.0.1 release 24
am c46e6eaa: (-s ours) am 12c2e1d4: (-s ours) Import translations. DO NOT MERGE

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