OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6849698 c2c317a)
am c2c317aa: am d990706b: am 0bea7286: am e5238f7a: Merge "DozeLog: Keep keyguard...
authorJohn Spurlock <jspurlock@google.com>
Tue, 30 Sep 2014 16:11:48 +0000 (16:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Sep 2014 16:11:48 +0000 (16:11 +0000)
* commit 'c2c317aa5372c65d33378a066bd1d9fe8c824b1f':
  DozeLog: Keep keyguard monitor alive, keep emer call stats.


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