Merge "Adjust test to changed internal API"
tree: 7f0edd6b4fd22e2a06b17a9237e8e38460d2c533
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg