tree dc3c662c8d0b28fe48270a23124b38c1a84245ba
parent 7a3036792971e8d4c813684ec306b1da9fb0a3fb
parent 840975d91d3e9f4bb6ff8aeef35d1c9e05a1eac2
author Aaron Huang <huangaaron@google.com> 1581675607 +0000
committer Aaron Huang <huangaaron@google.com> 1581675607 +0000

Merge "Remove framework code that has moved to frameworks/libs/net" am: 03d86d613c am: 840975d91d

Change-Id: Ic03b259e256f935c2c625f294bea497b82b6317e