OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ab6dbc 1e46035)
am 06d429a2: am 96de06e6: am b1c0b008: Merge "resolved conflicts for merge of 75f3174...
authorCraig Mautner <cmautner@google.com>
Thu, 17 Jul 2014 21:04:56 +0000 (21:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Jul 2014 21:04:56 +0000 (21:04 +0000)
* commit '06d429a2b6b2658028c5f32b6ca6307a549b3905':
  Wait for all windows to draw before turning screen on


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