tree 9ff7f93dcb8cd5395d153808ad465150f53156d6
parent 515d41ee4b2ed7c17bde99ef64025509e1477258
parent 1073385f866a59797cb5d7dbac988f2ba08e753c
author Tom O'Neill <tomo@google.com> 1377624630 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377624630 -0700

am 1073385f: am ed92f012: Merge "Test case where SettingsInjectorService.getStatus() errors out" into klp-dev

* commit '1073385f866a59797cb5d7dbac988f2ba08e753c':
  Test case where SettingsInjectorService.getStatus() errors out