commit | 297b563b9a6e3aa0db6d78afae169fc132bceef2 | [log] [tgz] |
---|---|---|
author | Santos Cordon <santoscordon@google.com> | Tue Oct 21 23:29:42 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 21 23:29:42 2014 +0000 |
tree | ab47f25ed60836e2c28245ceca50dde97c465ace | |
parent | 5d475dda0d2c2a220b8e33e77f9a40f5983c75b9 [diff] | |
parent | 2f764cb991913fe829c7d1d5fd3aac662b76fcd7 [diff] |
am 2f764cb9: Merge "ACTIVE->HOLD happens before HOLD->ACTIVE" into lmp-dev * commit '2f764cb991913fe829c7d1d5fd3aac662b76fcd7': ACTIVE->HOLD happens before HOLD->ACTIVE