| commit | 8d41bb0078e3982e52bdd1bbc33d2fbba5752ad4 | [log] [tgz] |
|---|---|---|
| author | Eric Rowe <erowe@google.com> | Thu May 08 18:23:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 08 18:23:55 2014 +0000 |
| tree | b51cfc45b44b2f146e8a30f01f846d4587ca7d36 | |
| parent | 940e2c12ea8cca7ff7d675f88961ffe26ba93823 [diff] | |
| parent | 0c7b480395b930a2a268cf05eb91905b1b54eacf [diff] |
am 0c7b4803: am 5a11f21a: am 5f510147: Merge "Add alarm/wakelock operations" * commit '0c7b480395b930a2a268cf05eb91905b1b54eacf': Add alarm/wakelock operations