summaryrefslogtreecommitdiffstats
path: root/include/android_runtime/android_view_Surface.h
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-08-11 00:50:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-11 00:50:56 -0700
commit7b6d0d99b6904b511996267efae215fe9cb5e98f (patch)
tree85c1f63b5ba66ec77d5c9ecd5a2b44229ed67699 /include/android_runtime/android_view_Surface.h
parentea65ec23f6dc18e978ab6dcf23d3c2b27a0c2109 (diff)
parent679ac09a5c22175354f3a04b28456b323839530e (diff)
downloadframeworks_base-7b6d0d99b6904b511996267efae215fe9cb5e98f.zip
frameworks_base-7b6d0d99b6904b511996267efae215fe9cb5e98f.tar.gz
frameworks_base-7b6d0d99b6904b511996267efae215fe9cb5e98f.tar.bz2
am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbread
Merge commit '679ac09a5c22175354f3a04b28456b323839530e' * commit '679ac09a5c22175354f3a04b28456b323839530e': More native work.
Diffstat (limited to 'include/android_runtime/android_view_Surface.h')
0 files changed, 0 insertions, 0 deletions