| commit | 7094ec6531ead3c6ed8dbcea1f834e84ad0384ea | [log] [tgz] |
|---|---|---|
| author | Dan Stoza <stoza@google.com> | Wed Apr 01 19:28:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 01 19:28:09 2015 +0000 |
| tree | 4e33349f1bd8f4416bbdcf4f248e2aa78d0785c1 | |
| parent | da98715359b9dfdf0612b40a548df0a9a3abfdf3 [diff] | |
| parent | 2c0e26fe42771b7fae55f139c504c129b4a9748d [diff] |
am 2c0e26fe: (-s ours) am 1eedd9ae: am b4c7472f: (-s ours) am e7988c6c: (-s ours) Merge "DO NOT MERGE libcameraservice: Stop using IGBC::BufferItem" * commit '2c0e26fe42771b7fae55f139c504c129b4a9748d': DO NOT MERGE libcameraservice: Stop using IGBC::BufferItem