tree 96e45afe2304ed0c89f8a900eb605849d5208da3
parent ac08180346cc9c83c04ba16684b98af44a7566b3
parent e3cf96ccbe200c4bd3d007eecd3ec83e4a0b5125
author Glenn Kasten <gkasten@google.com> 1366389007 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366389007 -0700

am e3cf96cc: am dbe60357: Merge "Use correct pid when running under test harness" into jb-mr2-dev

* commit 'e3cf96ccbe200c4bd3d007eecd3ec83e4a0b5125':
  Use correct pid when running under test harness