OSDN Git Service

am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert...
authorPrashant Malani <pmalani@google.com>
Fri, 12 Jun 2015 16:29:47 +0000 (16:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Jun 2015 16:29:47 +0000 (16:29 +0000)
commita8cff2acb7cc18d1cf123f45eb4e47e1ab876a20
treef705716e5d9a0f5f18844ec4b17e8a1dc7f10852
parent94476be6a4055d09413d51e489446bf220c440a6
parent327b481f1f2499eaa5ab938e63a2c12c21fe7482
am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev

* commit '327b481f1f2499eaa5ab938e63a2c12c21fe7482':
  DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"