diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-10-18 09:30:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 09:30:57 -0700 |
| commit | 246d8b7d154a257676e83257c1425b8ef9ba2574 (patch) | |
| tree | cb1ba5bbc66119c5b90b12d6e89c8c71757be1c8 /cmds/surfaceflinger | |
| parent | 613ef2efa30e66591af45e3f394c0d00caf447ee (diff) | |
| parent | 53820a9694a8f3c6564edb6caf90350e96b57567 (diff) | |
| download | frameworks_base-246d8b7d154a257676e83257c1425b8ef9ba2574.zip frameworks_base-246d8b7d154a257676e83257c1425b8ef9ba2574.tar.gz frameworks_base-246d8b7d154a257676e83257c1425b8ef9ba2574.tar.bz2 | |
am 53820a96: (-s ours) am 7ef6834e: Merge "DO NOT MERGE" into gingerbread
Merge commit '53820a9694a8f3c6564edb6caf90350e96b57567'
* commit '53820a9694a8f3c6564edb6caf90350e96b57567':
DO NOT MERGE
Diffstat (limited to 'cmds/surfaceflinger')
0 files changed, 0 insertions, 0 deletions