OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1011032 3372cc2)
am 3372cc25: resolved conflicts for merge of 03eccb66 to lmp-mr1-dev-plus-aosp
authorDan Stoza <stoza@google.com>
Sat, 17 Jan 2015 00:53:35 +0000 (00:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 17 Jan 2015 00:53:35 +0000 (00:53 +0000)
* commit '3372cc25df255b94e4eb75920afaf43ee5edc39f':
  SurfaceFlinger: Attempt to attribute fds to layers


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