tree 65de53345ea854be2b90efc251f0eb000b58a3bd
parent d401ed099ee6005c075f68b41a9a33c14685bdb2
parent eb33356544c3b87408d79e2125efdfe20787855a
author Zhang, GaofengX <gaofengx.zhang@intel.com> 1560385183 -0700
committer android-build-merger <android-build-merger@google.com> 1560385183 -0700

Merge "Avoid key_queue_mutex deadlock in waitkey()"
am: eb33356544

Change-Id: I77a49758aefeb521cab18aa66942fa80f6752135