Merge "Tighten flags enforcement, API to test Uris." into klp-dev
tree: 08f4f121fef127abdde005cc5fa67289f2e52578
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml