tree 78ff0776ab5a5ad548ca767ec5364faedfe3dab7
parent 2275fe2c5322b37413e160d780e9336e87b885b2
parent ec996b381d5f92fe2c78429e580d4d615dc95724
author Wyatt Riley <wyattriley@google.com> 1500682722 +0000
committer android-build-merger <android-build-merger@google.com> 1500682722 +0000

Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev
am: ec996b381d

Change-Id: Ifa49f58660363d78d79eaa3851fe818fb6b75763