OSDN Git Service

(root) / android-x86 / frameworks-native.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: be4ccdc) | patch
libgui: Fix bad merge in Surface.h
authorDan Stoza <stoza@google.com>
Thu, 19 Mar 2015 18:26:45 +0000 (11:26 -0700)
committerDan Stoza <stoza@google.com>
Thu, 19 Mar 2015 18:26:45 +0000 (11:26 -0700)
commit1a309eba79067bd3d1f73406fdcbc44a385a0c4d
treed0820fa6babdf97f8424f350d29e1f5b6acfaf88tree | snapshot
parentbe4ccdcdd5988948a7876af0d1f621840a36eaa1commit | diff
libgui: Fix bad merge in Surface.h

Fixes a bad merge from AOSP.

Change-Id: Idb69b34787e8f4e76fb64130573168e5fde6a87c
include/gui/Surface.h diff | blob | history
frameworks/native
About OSDN
Find Software
Develop Software
Help