diff options
author | Mathias Agopian <mathias@google.com> | 2010-10-16 08:52:30 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-16 08:52:30 -0700 |
commit | 596e590b472dc33a522f32a74e1f3bacb57534ab (patch) | |
tree | b302dc1b4c366aef6900082860eca6416a87f3c5 /include/surfaceflinger/SurfaceComposerClient.h | |
parent | 1cf3e2d0029e3f93d0c22a1b7a37025464c6c660 (diff) | |
parent | 7e9a54d460030a871a4f05e61e943c6a694e9ef8 (diff) | |
download | frameworks_base-596e590b472dc33a522f32a74e1f3bacb57534ab.zip frameworks_base-596e590b472dc33a522f32a74e1f3bacb57534ab.tar.gz frameworks_base-596e590b472dc33a522f32a74e1f3bacb57534ab.tar.bz2 |
am 7e9a54d4: am d4e03f37: addresses parts of 3096779 and 3097475
Merge commit '7e9a54d460030a871a4f05e61e943c6a694e9ef8'
* commit '7e9a54d460030a871a4f05e61e943c6a694e9ef8':
addresses parts of 3096779 and 3097475
Diffstat (limited to 'include/surfaceflinger/SurfaceComposerClient.h')
0 files changed, 0 insertions, 0 deletions