OSDN Git Service

Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-dr1-dev
authorMatthew Fritze <mfritze@google.com>
Mon, 31 Jul 2017 23:50:03 +0000 (23:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 31 Jul 2017 23:50:03 +0000 (23:50 +0000)
am: 9feab7a8a5

Change-Id: I45565eb7bd6046cc20ccb223d88d1ac31a95d6b5


Trivial merge