tree 45f09240d031fa0081e999f25c6f357a1b0538d3
parent e2afb29295bd17cb290c78910f78f1dac9392b10
parent 52e018287053c7a934c69cb7f71de2b1a6177630
author Maciej Zenczykowski <maze@google.com> 1562086918 -0700
committer android-build-merger <android-build-merger@google.com> 1562086918 -0700

[automerger skipped] Merge "Fix mobile data usage didn't get increased for xlat464 traffic" into qt-r1-dev
am: 52e0182870 -s ours
am skip reason: change_id I8ebbefbe4df00e40f4896a17fa52c8438d41286e with SHA1 feb79bd0d7 is in history

Change-Id: I3057302f5585eb585af6ad3e9b8e101c8738b879