Merge "Adding encryption aware matcher flags to install shortcut disabling" into nyc-mr1-dev
tree: 3c4666ed247ae10e17af10b195f8ae0ce6368602
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. CleanSpec.mk