tree 9485b52384c07c29d392a868f008b17fb291bd43
parent 0b35da7165e9b78a5e35200bac3df4b2c6bc7c36
parent 1a98776aee4d02c33d922bbbe3ffdd54099840a9
author Elliott Hughes <enh@google.com> 1464130598 +0000
committer android-build-merger <android-build-merger@google.com> 1464130598 +0000

resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6
am: 1a98776aee

* commit '1a98776aee4d02c33d922bbbe3ffdd54099840a9':
  Fix scanf %s in lsof.

Change-Id: I1af0d93d03631f257b1372a08aad158508f652ea