tree 1e7d89babfc990ef5f430a1ad27f868b7a2c47a2
parent 44b09f8b55bef56e06ad584db231916c17e30f5b
parent 2d344979eb200b7fb8ba4d811a22c80b1d77b564
author Aravind Akella <aakella@google.com> 1381704719 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381704719 -0700

am 2d344979: Merge "Adding PackageManager feature strings for stepcounter and stepdetector." into klp-dev

* commit '2d344979eb200b7fb8ba4d811a22c80b1d77b564':
  Adding PackageManager feature strings for stepcounter and stepdetector.