commit | 80cc1ebde9fd61c859ae45cd3958fcf32de75ea1 | [log] [tgz] |
---|---|---|
author | Wink Saville <wink@google.com> | Thu Aug 08 15:46:46 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 08 15:46:46 2013 -0700 |
tree | 4ed07b432d0dd149a2c89a20298badfa4b2f6019 | |
parent | 6b67e07d2186cdbd3233a6d1f0e67cce9437a0b0 [diff] | |
parent | 4a165bb3de74bebed12ea9df0ca4ec975a9b8240 [diff] |
am 9b6363e5: am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev * commit '9b6363e5e6d37e3e8d103751d81613eeca32bbbf': Check that hipri has started.