tree a9120bc031878aa07f51376c556154040a4ad89a
parent a6547d6f7275d3f617bd10a2e66b162169825307
parent 93534ddd9a0512866f11bc36dc5b21b4a3998dba
author Greg Kaiser <gkaiser@google.com> 1473381423 +0000
committer android-build-merger <android-build-merger@google.com> 1473381423 +0000

Merge "ContextHubService: Keep handles across hub reboot" into nyc-mr1-dev am: 8e91087c3a
am: 93534ddd9a

Change-Id: I404fc988efe0c3a5d40a004f98663d94379ae4d6