diff options
author | Mathias Agopian <mathias@google.com> | 2010-10-14 15:17:16 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-14 15:17:16 -0700 |
commit | 7e9a54d460030a871a4f05e61e943c6a694e9ef8 (patch) | |
tree | bf9ceeac3814d10936174d73ee85b586b633095e /include/surfaceflinger/Surface.h | |
parent | a8faf91fa558be1235d508e776eb24be4429585c (diff) | |
parent | d4e03f37423bee383d17f7292753a5f67e497a28 (diff) | |
download | frameworks_base-7e9a54d460030a871a4f05e61e943c6a694e9ef8.zip frameworks_base-7e9a54d460030a871a4f05e61e943c6a694e9ef8.tar.gz frameworks_base-7e9a54d460030a871a4f05e61e943c6a694e9ef8.tar.bz2 |
am d4e03f37: addresses parts of 3096779 and 3097475
Merge commit 'd4e03f37423bee383d17f7292753a5f67e497a28' into gingerbread-plus-aosp
* commit 'd4e03f37423bee383d17f7292753a5f67e497a28':
addresses parts of 3096779 and 3097475
Diffstat (limited to 'include/surfaceflinger/Surface.h')
0 files changed, 0 insertions, 0 deletions