Merge "Adding encryption aware matcher flags to install shortcut disabling" into nyc-mr1-dev
am: 7a73ea5f29

Change-Id: Iacb369b0162195236f107812d9271c5c7070547d
tree: 73ab183c3598313e9cf00bd4885dbdef87541b20
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. CleanSpec.mk