OSDN Git Service

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


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