OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0684ff9 3170581)
am 31705817: resolved conflicts for merge of 04c9683a to lmp-mr1-dev-plus-aosp
authorJesse Hall <jessehall@google.com>
Fri, 31 Oct 2014 22:58:46 +0000 (22:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 31 Oct 2014 22:58:46 +0000 (22:58 +0000)
* commit '3170581704fa59a8672262c0e6c68f455d470214':
  surfaceflinger: fix -Wmismatched-tags warnings


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