OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 88bc975 786cd12)
am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kerne...
authorPrashant Malani <pmalani@google.com>
Thu, 11 Jun 2015 23:52:49 +0000 (23:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Jun 2015 23:52:49 +0000 (23:52 +0000)
* commit '786cd12f785374f93c19c909687ea300e41ffbc2':
  DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help