am 8c6c0419: Merge "Tighten flags enforcement, API to test Uris." into klp-dev

* commit '8c6c04197e58be6f3e46ba6a38f5d16e4fb091fa':
  Tighten flags enforcement, API to test Uris.
tree: 3dec0caada4c795d456db399cb02bb4d4c6ea061
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml