OSDN Git Service

Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev
authorJohn Spurlock <jspurlock@google.com>
Wed, 5 Nov 2014 15:20:12 +0000 (15:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Nov 2014 15:20:12 +0000 (15:20 +0000)
commit513f26020095c409aa3e828c98485ed20aa9eaa9
tree15ec3d61528edc68561cca691d43bcb3e623481e
parent055acca7c8691921572f8e9845bd4d46b96c7251
parent0bdefb9953fd51c86f81a6033a00926a63916065
Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev
automerge: 0bdefb9

* commit '0bdefb9953fd51c86f81a6033a00926a63916065':
  Zen: Create a new exit condition for "next alarm".