Skip to content
Commit b494d18c authored by Anthony Hugh's avatar Anthony Hugh Committed by android-build-merger
Browse files

Merge "Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for... 

Merge "Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev am: 75bf8145 am: f3eef9a2" into nyc-mr2-dev-plus-aosp
am: a351145b  -s ours

Change-Id: I8ef5b99d3dcefe4f08e73390cab2e53de62ffb26
parents 45b1ec8e a351145b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment