tree d27348f702363cae69764cb23aa31693daba5eda
parent 204f535e2c16620b5895a58dd5040dec55771722
parent 3ebe54b3e6e3392e18c9a7816191a73903aa162b
author Bryce Lee <brycelee@google.com> 1495464212 +0000
committer android-build-merger <android-build-merger@google.com> 1495464212 +0000

Merge "Disallow starting activities without new task from non-activity context." into oc-dev
am: 3ebe54b3e6

Change-Id: I4a89ce60dad32f41f4e77b81a6af56c89845987a