tree 60c39ca2fcb8bebd856f6443a3e5c2c9cacb880c
parent f13f3bdaff85d429ac602027cc7d5867cec65ba9
parent 90ced9877c14d4d78f8bafb022ed540c0078ad5d
author Zhang, GaofengX <gaofengx.zhang@intel.com> 1560387676 -0700
committer android-build-merger <android-build-merger@google.com> 1560387676 -0700

Merge "Avoid key_queue_mutex deadlock in waitkey()" am: eb33356544 am: 6a550f518e am: 7d453edf34
am: 90ced9877c

Change-Id: I5f8b6cc3f4801f14dfc45b15fdc2d10b05b1a2fe