tree 9af3ba58bbd7f666e649f4ff3347e3c9f043f353
parent 2f3c8d070a7511129f80b11b5916f2f3a4264f3e
parent 2de2e22540441fd02e03abae5bcae8feb873b929
author Brian Carlstrom <bdc@google.com> 1398980943 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398980943 +0000

am 2de2e225: am e3cceef7: am 0f7c0570: Merge "Minor cleanup of UsageStatsService"

* commit '2de2e22540441fd02e03abae5bcae8feb873b929':
  Minor cleanup of UsageStatsService