[automerger skipped] Use NetworkFactory from frameworks/libs/net. am:...
[automerger skipped] Use NetworkFactory from frameworks/libs/net. am: c3b47810 am: 05f08d82 -s ours am: 4b0e1f0b -s ours
am skip reason: Change-Id Idb12389069c4c95bf09dc835186358ebeb1f9d76 with SHA-1 5d9e643b is in history
Change-Id: Ia820ef3f8c0d512aa04eed9970309b7bdf11fede