OSDN Git Service

Merge "ContextHubService: Allow cancelling load/unload" into nyc-mr1-dev am: 40e6194148
authorGreg Kaiser <gkaiser@google.com>
Mon, 29 Aug 2016 18:16:36 +0000 (18:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 29 Aug 2016 18:16:36 +0000 (18:16 +0000)
commit4aa9e58f94e1a5bceb536cd17bec02870c80f162
tree0ddb5b5869ec7bbfb8145c0234da414aa16c2f75
parentcb310cc2171bea51f68d0fa8e7fea72b0ff6e03e
parent4db7ca82d4ca1fe00cc68d67bd318fdda48f2f47
Merge "ContextHubService: Allow cancelling load/unload" into nyc-mr1-dev am: 40e6194148
am: 4db7ca82d4

Change-Id: I8ed8c8210b8ea1429e165db322ce302fa2d00c56