tree a595b6ae63bf197f5bc5bdc99c1868b31d9970e9
parent 1ec5cac9413724403601632d3aad1896483a6ee8
parent cadaee6b4c3b33e1ca13fe0f1ea3ab73c9e121d7
author Scott Main <smain@google.com> 1335305984 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335305984 -0700

am cadaee6b: am 9e99d86b: am d5955b02: Merge "docs: add section to basic intent class about using the activity chooser" into ics-mr1

* commit 'cadaee6b4c3b33e1ca13fe0f1ea3ab73c9e121d7':