tree dc3c662c8d0b28fe48270a23124b38c1a84245ba
parent 3d517a35aa0f9a7d1bb7002a5d5b8a8f05feb096
parent 0122cf102fdb8688536731068de3aa4fc440e495
author Aaron Huang <huangaaron@google.com> 1581674016 +0000
committer Aaron Huang <huangaaron@google.com> 1581674016 +0000

Merge "Remove framework code that has moved to frameworks/libs/net" am: 0122cf102f

Change-Id: I20b8398f1fe410819f18a0afcd8646c75c594fb8