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

* commit '47e274c56a0662e3e2aef24f2a458cc078e70fd8':
tree: 5948dea0d797fc138f1f70d257111af6e10aa6c9
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py