tree e3ff593567707ada99dffacc241320afbaaba63b
parent a351145b9b55801baf772c12e2b4ed8013eb8ed7
parent a87e824100aab958e651a9760d852547ee4ff79b
author Android Build Merger (Role) <android-build-merger@google.com> 1480476934 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1480476937 +0000

Merge "Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf81458e am: c27f8b025f" into nyc-mr2-dev-plus-aosp