| commit | da3b1e7ff20559ba368a22421c15ffe2cc079386 | [log] [tgz] |
|---|---|---|
| author | Dan Stoza <stoza@google.com> | Fri Mar 20 19:13:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 19:13:33 2015 +0000 |
| tree | 61082292018620effd6d13d185bc7403d59aea76 | |
| parent | c6fdc017fe9ea00dfd3817978c169f64b78e6e95 [diff] | |
| parent | 237079112d245f8415970bd219cb174dae21ac3b [diff] |
am 23707911: (-s ours) am 701473cf: (-s ours) Merge "DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem" * commit '237079112d245f8415970bd219cb174dae21ac3b': DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem