tree 5761b0d79a4b5b5c3593fe72efceab24c5623cd5
parent 4a1c0bd20b317fbc48efc35f986b9a7f5cef128e
parent df8e542a8a638c18074221f47c4e4afcd3502810
author Craig Mautner <cmautner@google.com> 1402420912 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402420912 +0000

am a7c5791a: Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev

* commit 'a7c5791a95bf732c2381f698d78930ee61efd36b':
  Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK