tree 5f5cfd4edb7462db936cc951dee7969dfe07d33e
parent ee46eab2d026c9d22d6243cc945c150c877edc16
parent 0b1ec0165a5dc98bc82670288894af446ff5bcaa
author Dianne Hackborn <hackbod@google.com> 1382740650 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382740650 -0700

am 0b1ec016: am 19d79659: Merge "Fix issue #11374840: adb shell am startservice not working any more" into klp-dev

* commit '0b1ec0165a5dc98bc82670288894af446ff5bcaa':
  Fix issue #11374840: adb shell am startservice not working any more