summaryrefslogtreecommitdiff
path: root/libs/surfaceflinger/SurfaceFlinger.cpp
diff options
context:
space:
mode:
author John Wang <johnwang@google.com> 2010-04-21 14:51:43 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-04-21 14:51:43 -0700
commit81b7ea00283378bd896ec7d587b1379c6197e4e7 (patch)
treef86dc97d936e7576657bf8e2d515a303102fb08d /libs/surfaceflinger/SurfaceFlinger.cpp
parenta8624186a6f7a29697bf5a112e46a80ca796c9c5 (diff)
parentf77fff4b4e904486bf25affde713294d40764e15 (diff)
am f77fff4b: am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo
Merge commit 'f77fff4b4e904486bf25affde713294d40764e15' into kraken * commit 'f77fff4b4e904486bf25affde713294d40764e15': Add ILLEGAL_SIM_OR_ME error code.
Diffstat (limited to 'libs/surfaceflinger/SurfaceFlinger.cpp')
0 files changed, 0 insertions, 0 deletions