tree 86a49708fe296ba8f6f9896aae408ee42b84ac56
parent 9a5af95e1250ac2c14c3eb90ba4eb57b19c70d79
parent fd80b569f9e1f0f424bcd6ce1d5875541102eb9b
author Lei Yu <jackqdyulei@google.com> 1562782709 -0700
committer android-build-merger <android-build-merger@google.com> 1562782709 -0700

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

Change-Id: I028536be6c63a9c0424d998e5dd6fe14bf75c71e