tree cb7da54249c39b7a175ea13d6f305c775d403e97
parent 7c8e0918a191fc129c821e4769d9338ad3915908
parent 06659047f0479505618c1a85dfcfb46b750014ef
author Ryuki Nakamura <ryuki.x.nakamura@sonymobile.com> 1490030677 +0000
committer android-build-merger <android-build-merger@google.com> 1490030677 +0000

Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()" am: a6ce3f3021 am: 900620cffc
am: 06659047f0

Change-Id: Ia7c8309f68d85a88e2a26169509d3e45d4d2ff69