tree 8986caf776080a56a268e5113cbc0111f82e0fbb
parent c826cccc8d66657eb73cf0598c1f41095e28126a
parent 2067767d99c6a0e5764debb694eb9c4ab6ae6035
author Remi NGUYEN VAN <reminv@google.com> 1520365977 +0000
committer android-build-merger <android-build-merger@google.com> 1520365977 +0000

Merge "Allow null subscriberId in NetworkStatsManager." am: 0b9c645be1
am: 2067767d99

Change-Id: I1e4e283c6eaecf33d12488e41e0c524f6ff83954