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

* commit 'e8f6bd484627e16fa2fd9509b0f06056ee44be94':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
tree: 4b1bf7c43eddc14cd87697d9c76cfa60d96cc073
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml