tree 8a87c5fd4a3d375de0d7a926b1aa4b130af9ab36
parent 096c7f7b64fe832e20b8c4e769b8196455076ad6
parent 8c82d250723a2ae8f384c6602424a38a1ca101eb
author Scott Main <smain@google.com> 1362517405 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362517405 -0800

am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs

* commit '8c82d250723a2ae8f384c6602424a38a1ca101eb':
  docs: clarify startActivity