am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4
automerge: eada048

* commit 'eada048addc14a95ced54b17c6a75f5f899e2c2a':
tree: 809798e1d3fdcf1bf7e4962c45a73c111e694557
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py