Christopher Tate 4328db5769 am 892e65cb: am 0dab4dc0: Fix bad alarm delivery ...

automerge: 7c1f995

* commit '7c1f995b7bf171a1b556dcaa4dc16cf46db853be':
  Fix bad alarm delivery

2014-12-16 21:15:25 +00:00

..

java/com/android/server

am 892e65cb: am 0dab4dc0: Fix bad alarm delivery

2014-12-16 21:15:25 +00:00

jni

am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"

2014-12-11 21:02:08 +00:00

Android.mk

…