[automerger skipped] Use the new NetworkAgent API am: 29a08dde am:...
[automerger skipped] Use the new NetworkAgent API am: 29a08dde am: bf84f973 -s ours am: 92f50864 -s ours
am skip reason: Change-Id I1ce0209824dc74f38e2223ccfbf5e1c031404f69 with SHA-1 1efdefc4 is in history
Change-Id: Iccb849b32699808322a4e8ca89d6d8e3c31be0d3