tree 981333d35b19784d936ec54449c0eae5295a974a
parent 6ec76b0ff92889bff0b836dbfd59fe58e57aa386
parent ba5b3a0b4e334d56fa08a6c39eeee54384eec003
author Selim Cinek <cinek@google.com> 1411482308 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1411482309 +0000

Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev