| commit | 07426ef6c85dfedf68b7e53166ace82ff9e9eab5 | [log] [tgz] |
|---|---|---|
| author | Santos Cordon <santoscordon@google.com> | Wed Oct 22 20:47:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 22 20:47:16 2014 +0000 |
| tree | d6314452b2b19a27c8b89da2d48fad40f54a45f9 | |
| parent | b0545ab1c0569888a6f99699ab6f2f1e4565b04b [diff] | |
| parent | 297b563b9a6e3aa0db6d78afae169fc132bceef2 [diff] |
am 297b563b: am 2f764cb9: Merge "ACTIVE->HOLD happens before HOLD->ACTIVE" into lmp-dev * commit '297b563b9a6e3aa0db6d78afae169fc132bceef2': ACTIVE->HOLD happens before HOLD->ACTIVE