tree cc75c345ea39fb42bee8cd9676e2627ab6ddb19c
parent 788232785d8d498802013d0513ff8a2e70284b51
parent 2c74b2e5d8b4cae1bfa2eba897c66eb7462e2b7f
author Maciej Zenczykowski <maze@google.com> 1562095482 -0700
committer android-build-merger <android-build-merger@google.com> 1562095482 -0700

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

Change-Id: Ia76c06513e23c4052262c8ac4c7212a548267a8c