tree caa5b78af097544ccc3a8c06eac008de158feb64
parent cda2dafd36641130fc41888d81c98cd2d54047b8
parent 9be305d146fb422a0e65e5284af2ce081cdc6a69
author Adam Lesinski <adamlesinski@google.com> 1416876960 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416876960 +0000

am 9be305d1: Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev

* commit '9be305d146fb422a0e65e5284af2ce081cdc6a69':
  Make the Context service constant for UsageStats public