tree 1f13d6c772325d90c95db3961c515204728c4502
parent fd1fbcad5862877ca44f2d50d7cc063c8455f02d
parent b6022e3d500f248cf1abe94e8f1509e27ab25736
author Dianne Hackborn <hackbod@google.com> 1280172619 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280172619 -0700

am b6022e3d: am 14bfa398: Infrastructure to report running services to developer.

Merge commit 'b6022e3d500f248cf1abe94e8f1509e27ab25736'

* commit 'b6022e3d500f248cf1abe94e8f1509e27ab25736':
  Infrastructure to report running services to developer.