tree 37e31143179c493a9d7d220d235c68af52a82f8d
parent 44a27da934a67a2e52760ffadd0323a4c8224e63
parent 05afaeead603daec557e96927fb5e1722402a457
author Lei Yu <jackqdyulei@google.com> 1562784901 -0700
committer android-build-merger <android-build-merger@google.com> 1562784901 -0700

Merge "Use old API to build NetworkTemplate" into qt-dev am: e5fdc968a0 am: 68178f853b
am: 05afaeead6

Change-Id: I590bea15ee77d85c682580e16405c96b060ecdcc