tree 2366643d0483237afe4a9067796f3e4cbebccb37
parent 252d9030cd4b2e3e6cf13fa33f328eccedb5e26c
parent 740bf8da310308bb5419468e2bf6d3920b8d6385
author Lorenzo Colitti <lorenzo@google.com> 1385082101 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385082101 -0800

am 740bf8da: (-s ours) am 8c099bc2: Merge "Parse IP address changes in NetlinkEvent."

* commit '740bf8da310308bb5419468e2bf6d3920b8d6385':
  Parse IP address changes in NetlinkEvent.