tree 177358dce78f983dbe4c39f1aeba25474fc2e337
parent e3a45f93ab387e238c4bb770dd6d18d6c7702374
parent 7d453edf342c3ea82a6a0d47c7ea215318b7bd43
author Zhang, GaofengX <gaofengx.zhang@intel.com> 1560385973 -0700
committer android-build-merger <android-build-merger@google.com> 1560385973 -0700

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

Change-Id: I32845dfaddb1bdfea68f0861c0d37b478d84a9e7