tree 2c26cdcaf286b14baa838c09aecef5ffb041b706
parent 3c70ace5af31d14691de34be35d7c7c73c3fe423
parent 8a75ab5b918c4e65e1b8fe55ec193b047ddfcb06
author Matthew Xie <mattx@google.com> 1417724702 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417724702 +0000

am 8a75ab5b: Merge "PAN TAP fd is not monitored in all cases" into lmp-mr1-dev

* commit '8a75ab5b918c4e65e1b8fe55ec193b047ddfcb06':
  PAN TAP fd is not monitored in all cases