Merge "Protection against b/27946460" into nyc-dev
tree: 64dfff1d95cc76c84a6ee7643bdbed06453d915e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml