am 5edf43bd: Merge "Switch Tag over to the public StandardCharsets."

* commit '5edf43bdfdfc677523e1577df8cce2750a58ae0e':
  Switch Tag over to the public StandardCharsets.
tree: 434576e56b17b8e25678173a8376d077fc8d8324
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml