tree 9c9055f4856080cbda35b40d5c8ca3f2a8dd12eb
parent 0937d63919c7afb4e99a7e70f6376bb62b7e24d4
parent 35fcd6b0e3cf41fb1ffae707e3ae6e558623ba48
author Lei Yu <jackqdyulei@google.com> 1557881463 -0700
committer android-build-merger <android-build-merger@google.com> 1557881463 -0700

Merge "Use merged NetworkTemplate to query data usage" into qt-dev
am: 35fcd6b0e3

Change-Id: I1030f49eb9e24ad8bc4a10c3ab8890c34d20f8f6