OSDN Git Service

Merge "ContextHubService: Allow cancelling load/unload" into nyc-mr1-dev
authorGreg Kaiser <gkaiser@google.com>
Mon, 29 Aug 2016 17:59:30 +0000 (17:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 29 Aug 2016 17:59:30 +0000 (17:59 +0000)
am: 40e6194148

Change-Id: Idcb9f7a4f621f9dc2c66204ef9bd31b9a0649be0


Trivial merge