tree 7a9ca050e2c5dcdb397bfb0e30e77078b84e50d1
parent 0dd914bc8588dd4a3dfcf3b0abba74ce95b23287
parent 1a5aba333ecbc8e5f261769d906e35f726c8c7a6
author Wei Wang <wvw@google.com> 1540587999 -0700
committer android-build-merger <android-build-merger@google.com> 1540587999 -0700

Merge "InputFlinger: fix a typo in dump error log" am: 8bae3798cb
am: 1a5aba333e

Change-Id: I56f9ac03b84eb71ad350c2c378b9ad0b5b25278d