tree 2bcd45dc13bfef1dee43a9c3572f03dd2a1d383e
parent 53095bb5bdcb27c6c7a8fc155892a776d1759d5b
parent 48a1136c8b3000c651e8bcd86325acd1dce6e4ec
author The Android Automerger <android-build-merger@google.com> 1485499181 +0000
committer The Android Automerger <android-build-merger@google.com> 1485499181 +0000

Merge commit '48a1136c8b3000c651e8bcd86325acd1dce6e4ec' into nyc-mr1-dev-plus-aosp

* commit '48a1136c8b3000c651e8bcd86325acd1dce6e4ec':
  Implement metered tracking for NetworkStats summary queries.