tree 4e28a6fc5f21db6d7110fd583be4d87cd3a14eca
parent bc8bb009ae7144a81c66aeed985a929dbc4778e7
parent 9b6363e5e6d37e3e8d103751d81613eeca32bbbf
author Wink Saville <wink@google.com> 1376002006 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376002006 -0700

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

* commit '9b6363e5e6d37e3e8d103751d81613eeca32bbbf':
  Check that hipri has started.