diff options
author | Dan Stoza <stoza@google.com> | 2015-04-01 19:28:09 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-01 19:28:09 +0000 |
commit | 7094ec6531ead3c6ed8dbcea1f834e84ad0384ea (patch) | |
tree | 4e33349f1bd8f4416bbdcf4f248e2aa78d0785c1 | |
parent | da98715359b9dfdf0612b40a548df0a9a3abfdf3 (diff) | |
parent | 2c0e26fe42771b7fae55f139c504c129b4a9748d (diff) | |
download | frameworks_av-7094ec6531ead3c6ed8dbcea1f834e84ad0384ea.zip frameworks_av-7094ec6531ead3c6ed8dbcea1f834e84ad0384ea.tar.gz frameworks_av-7094ec6531ead3c6ed8dbcea1f834e84ad0384ea.tar.bz2 |
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
0 files changed, 0 insertions, 0 deletions