OSDN Git Service

Merge "Removed deprecated setExtras() method." into oc-dev
authorFelipe Leme <felipeal@google.com>
Mon, 12 Jun 2017 19:05:34 +0000 (19:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Jun 2017 19:05:34 +0000 (19:05 +0000)
am: 7c41ddb975

Change-Id: Id74b4becd0f26d185cad3ecbe539aaa69f7ac89e


Trivial merge