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)
am: 33894b2998

Change-Id: I27e90c362abd23746e4b854308cf14b46abe9293


Trivial merge