[automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: fcca217a94 -s ours am: 7f812a02cf -s ours
am skip reason: Change-Id I067cdc404e5a63947c19cb75069a39ae42faa3c8 with SHA-1 56115e5c01 is in history
Change-Id: I97618fd4abcd989ed3d39bc538c53a2031a0904b
This commit is contained in: