John Spurlock 6044b5f394 am 73546e53: Merge "Zen: Exit downtime on next alarm (if mode=none)." into lmp-mr1-dev ...

automerge: 3069aa2

* commit '3069aa2057826f5806e68544a3554fdc8d8d28c3':
  Zen: Exit downtime on next alarm (if mode=none).

2014-11-11 18:14:58 +00:00

..

java/com/android/server

am 73546e53: Merge "Zen: Exit downtime on next alarm (if mode=none)." into lmp-mr1-dev

2014-11-11 18:14:58 +00:00

jni

am a084d357: Merge "Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171" into lmp-mr1-dev automerge: c3e5599

2014-11-07 00:07:12 +00:00

Android.mk

…