Android 6.0.1 release 24
am 6132f211: (-s ours) am a1c7b9a3: (-s ours) am 8f85e85d: (-s ours) Import translations. DO NOT MERGE

* commit '6132f211785a3dda98d0b264c4cbcb4c7201a02e':
  Import translations. DO NOT MERGE