| commit | 1eedd9aedb99d067db8b52077d156ada76333eba | [log] [tgz] |
|---|---|---|
| author | Dan Stoza <stoza@google.com> | Wed Apr 01 18:34:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 01 18:34:39 2015 +0000 |
| tree | 4c2cbb428c9d0fdafec7ce53aa52da292fee72ec | |
| parent | 6bedacad9a67bb8eca5b3073ad41bb002207e623 [diff] | |
| parent | b4c7472f8e05e600b1097b61288dc20aa19c002c [diff] |
am b4c7472f: (-s ours) am e7988c6c: (-s ours) Merge "DO NOT MERGE libcameraservice: Stop using IGBC::BufferItem" * commit 'b4c7472f8e05e600b1097b61288dc20aa19c002c': DO NOT MERGE libcameraservice: Stop using IGBC::BufferItem