tree 75875a7f0293c18546fc22a23d546d5e58f6ff33
parent 74ec580873bb56cb5045a25efdb1eb7e2bac384c
parent 0f7c0570e091a284481c2406d8275d87c3786c1d
author Brian Carlstrom <bdc@google.com> 1398980518 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398980518 +0000

am 0f7c0570: Merge "Minor cleanup of UsageStatsService"

* commit '0f7c0570e091a284481c2406d8275d87c3786c1d':
  Minor cleanup of UsageStatsService