tree c14511148ac2291c5c1eed71ac749a9a72a3f230
parent fb8a1841086e239cbaa328247a94574ec88c7c8c
parent 9ad2ea5c61d4c8bca6f36d42601befa068459c7c
author Aaron Huang <huangaaron@google.com> 1581939067 +0000
committer Aaron Huang <huangaaron@google.com> 1581939067 +0000

[automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 03d86d613c am: 840975d91d am: 9ad2ea5c61 -s ours
am skip reason: skipped by user huangaaron

Change-Id: I7f5c1c3a41a779512658008fafe108b1e99182ec