tree c819f921f5d728f11fdf86b83b278bdfa9406722
parent 3a3290e36408ab6cdfd2607f2ee0258a8bd4e9db
parent 0f1259ccb7427af5d9f7cdd51d9be1a6f2ec9b8d
author Scott Main <smain@google.com> 1362517595 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362517595 -0800

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

* commit '0f1259ccb7427af5d9f7cdd51d9be1a6f2ec9b8d':
  docs: clarify startActivity