OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5d5d08 21de2f6)
am 21de2f62: am 08bea4c9: (-s ours) am 627f2681: Merge "Wait for KEY_SLEEP UP event...
authorJoe LaPenna <jlapenna@google.com>
Thu, 14 May 2015 21:37:36 +0000 (21:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 May 2015 21:37:36 +0000 (21:37 +0000)
* commit '21de2f629df37014dd269e746924374f3df0811a':
  Wait for KEY_SLEEP UP event before calling goToSleep()


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