tree 47213244487e34923a0784fbe1a78c98824b1bb0
parent fa0a1bd282f4d0ef4502b8ea296799fbf1b64f72
parent e5fdc968a08b9aa78b0da5c6d1a283e259500bed
author Lei Yu <jackqdyulei@google.com> 1562782058 -0700
committer android-build-merger <android-build-merger@google.com> 1562782058 -0700

Merge "Use old API to build NetworkTemplate" into qt-dev
am: e5fdc968a0

Change-Id: I35702ae50d5274defd6974245bf1209ad3a0115f