OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bce7799 03af2bf)
am 03af2bf6: (-s ours) am 1e954441: (-s ours) Merge "DO NOT MERGE libgui: Plumb attac...
authorDan Stoza <stoza@google.com>
Fri, 3 Apr 2015 16:29:54 +0000 (16:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 3 Apr 2015 16:29:54 +0000 (16:29 +0000)
* commit '03af2bf6c3a8c81836b572098c3e0be3dc7fc778':
  DO NOT MERGE libgui: Plumb attach/detach through Surface


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