tree ec6fc5fb0696e4ee5541b838bd7ede4115abf718
parent f634af37ca9c27e68e49c75d6f53102f7c4c7919
parent 0a8cc3ab7c7401d050bf472abad56fdaaf08dfdb
author Adrian Roos <roosa@google.com> 1493928248 +0000
committer android-build-merger <android-build-merger@google.com> 1493928248 +0000

Merge "TrustManagerService: Fix service binding leak" into oc-dev am: b0ebbc3d2c
am: 0a8cc3ab7c

Change-Id: I557d2ccf3be85953e54465e7691d4599465c1fb4