OSDN Git Service

Merge "Set flags on the correct Intent, please" into oc-mr1-dev
authorChristopher Tate <ctate@google.com>
Mon, 4 Sep 2017 11:00:59 +0000 (11:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Sep 2017 11:00:59 +0000 (11:00 +0000)
commita80316daa30ecdfd5e198fcb494d32b89d80b05c
tree16b33f2ae4bc4b2d7b30be3e919b342c38ac93de
parent41be81318cfcec3aed1ba1ea3b75a9bdee2a1bd4
parent33894b2998b15b0f7526bfc39dfdbbfa124fd700
Merge "Set flags on the correct Intent, please" into oc-mr1-dev
am: 33894b2998

Change-Id: I27e90c362abd23746e4b854308cf14b46abe9293