am d8429c9e: am d2ef530c: am c15d523f: Merge "Update Outline API" into lmp-dev

* commit 'd8429c9efd9ade84c4aa0f38b64d51e36c626cf0':
  Update Outline API
tree: 8d5bf7e2e9743e7f5c18415b4a9f37dd330b210e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags