tree 7d1860799e3538a94d64b005df255136b457676a
parent fe6fd5d29d1ddefa52243ce7f6a3da91d188723d
parent 1559f1c5a0a4db23b8338b8c4792dcb351c541f8
author Dianne Hackborn <hackbod@google.com> 1439950883 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439950883 +0000

am 1559f1c5: am 217d4568: am 8100b3fa: am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest

* commit '1559f1c5a0a4db23b8338b8c4792dcb351c541f8':
  Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest