tree 5658e4c29b7b3b0a9cabefa54080bf0d15881834
parent 9b32f9a46687c1f9d720452f8972e43f1d15294b
parent efd8a85d30c35ca4a274835f10e371289bb9bc5e
author Adam Lesinski <adamlesinski@google.com> 1415140623 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415140623 +0000

am efd8a85d: Merge "Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService" into lmp-mr1-dev

* commit 'efd8a85d30c35ca4a274835f10e371289bb9bc5e':
  Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService