tree ac5dd425643624b52ccf14abf4581e859ea233df
parent 6aeabc10fc7a8da75a51036cfc28b4f3ac479f70
parent f0be3bfcd03afc09e12745d6dc61cb04d6d60f95
author Jack Yu <jackyu@google.com> 1496296781 +0000
committer android-build-merger <android-build-merger@google.com> 1496296781 +0000

Merge "Added video calling data usage per-uid support" am: 9b07c109a0 am: 2c833123a0 am: ad880ae6cd
am: f0be3bfcd0  -s ours

Change-Id: I8bae3bc622f8aba6221579cf1ce238cb43477a9b