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