tree 943703565f95f9f40ef147b4651a4f7609886177
parent 5bb603c1e1984dcac0bc7b0e4f82c623710d54a8
parent dbe60357db3be0fd6268ce777647733c3383aa72
author Glenn Kasten <gkasten@google.com> 1366388796 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366388796 -0700

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

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