OSDN Git Service

Merge "contexthub: Handle service death" into oc-dev
authorBrian Duddie <bduddie@google.com>
Tue, 6 Jun 2017 16:49:48 +0000 (16:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Jun 2017 16:49:48 +0000 (16:49 +0000)
commit7e4e4f57caf9949e8c117da0e1e26ed0cd794e6f
tree9e5a26ad275fc6f03ca78169525b643fb62294f2
parent7b9e6a5300bd37080cc81f33fa52e997ad213c9d
parentbbcf199e936b7611de92c7f1436845aafd54c3a9
Merge "contexthub: Handle service death" into oc-dev
am: bbcf199e93

Change-Id: Icdb7d82550743333a373bdc08b061751999dc54b
contexthub/1.0/default/Contexthub.h