tree a30aa00bcdecfdd81919fddb7fbe5a3fee2fa15b
parent e0fac27d4d02cb2c0b096b2fed4e34ba422d9e92
parent bcd5f33d7eea7c09fe727d61613429c0d49c2086
author Wink Saville <wink@google.com> 1376004134 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376004134 -0700

am bcd5f33d: am 9b6363e5: am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev

* commit 'bcd5f33d7eea7c09fe727d61613429c0d49c2086':
  Check that hipri has started.