Android 6.0.1 release 24
am 7c38f0e0: (-s ours) am fdccac1e: (-s ours) Import translations. DO NOT MERGE

* commit '7c38f0e0f34ddfb3db94173a1f94296381c1665b':
  Import translations. DO NOT MERGE
tree: ca42153c9732c1e571305fa2322d48c4ee69f5e7
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml