summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger/LayerBase.cpp
diff options
context:
space:
mode:
authorJohn Wang <johnwang@google.com>2011-06-16 16:47:18 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-16 16:47:18 -0700
commitc826f92e6f90f4157afd4ed69c6907ff768a0d6b (patch)
tree0296786cc942ebb3f56df897047a2c861e216f5d /services/surfaceflinger/LayerBase.cpp
parent2f04883ff880966d63d1aa4a1c7b05e497cfcc58 (diff)
parentfe9aa2706ff9e5059d5e2737d751122fb5d692b9 (diff)
downloadframeworks_base-c826f92e6f90f4157afd4ed69c6907ff768a0d6b.zip
frameworks_base-c826f92e6f90f4157afd4ed69c6907ff768a0d6b.tar.gz
frameworks_base-c826f92e6f90f4157afd4ed69c6907ff768a0d6b.tar.bz2
Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
Diffstat (limited to 'services/surfaceflinger/LayerBase.cpp')
0 files changed, 0 insertions, 0 deletions