tree 967011c5d220b68670517c8ed81086d59c6995fd
parent b283a388c89ded5f1062dec42af28acf77b6cf32
parent 2b319b14e2f88d0194823544788c46be8d5af898
author Aaron Huang <huangaaron@google.com> 1642656854 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642656854 +0000

Merge "Replace buildTemplate* with NetworkTemplate.Builder" am: b892406528 am: 2b319b14e2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933089

Change-Id: I8b868833c50a8401ee751e8e95f3ee3e54f9a222