OSDN Git Service

Merge "Added video calling data usage per-uid support" am: 36fdb346f2 am: 2f74c02826...
authorJack Yu <jackyu@google.com>
Thu, 1 Jun 2017 06:00:59 +0000 (06:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Jun 2017 06:00:59 +0000 (06:00 +0000)
am: b67a128206  -s ours

Change-Id: I63e6eac2b46aad6999307833b79bf6032a0721fd


Trivial merge