tree d6314452b2b19a27c8b89da2d48fad40f54a45f9
parent b0545ab1c0569888a6f99699ab6f2f1e4565b04b
parent 297b563b9a6e3aa0db6d78afae169fc132bceef2
author Santos Cordon <santoscordon@google.com> 1414010836 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414010836 +0000

am 297b563b: am 2f764cb9: Merge "ACTIVE->HOLD happens before HOLD->ACTIVE" into lmp-dev

* commit '297b563b9a6e3aa0db6d78afae169fc132bceef2':
  ACTIVE->HOLD happens before HOLD->ACTIVE