tree 868b082e6738e04f46f0fdacd06c71e1aa8174ca
parent 631a4590916473fdc5a8d9ba767d320e118b013c
parent 0aa0d09202f543cc85962f348c4ff4c9937d057d
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