tree b69a535e491b92c7a861ee04ba71fb2735841e0c
parent 10743a9db69c895a64e60eed86c226a9968ab0b2
parent 1265fd493471b6e94cc4e9853d9307d7fde2fe98
author Elliott Hughes <enh@google.com> 1464152477 +0000
committer android-build-merger <android-build-merger@google.com> 1464152477 +0000

resolve merge conflicts of f0d4f38 to nyc-dev
am: 1265fd4934

* commit '1265fd493471b6e94cc4e9853d9307d7fde2fe98':
  Fix scanf %s in lsof.

Change-Id: I2e581b2dae519f77399a149d3de3c710cf629d29