diff options
| author | Ying Wang <wangying@google.com> | 2011-03-15 14:43:30 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-03-15 14:43:30 -0700 |
| commit | 07248e51c6721d21f399a37912959c8f039fd9bc (patch) | |
| tree | 700b9eb4423946331c0f1baaee6e610d470d349e /libcamera | |
| parent | 03b4dcd935676363d495b48ef45aae6a2184506e (diff) | |
| parent | 0ea9ad817b9b23be8035d4fd23ebff7cb44e153a (diff) | |
| download | device_samsung_crespo-07248e51c6721d21f399a37912959c8f039fd9bc.zip device_samsung_crespo-07248e51c6721d21f399a37912959c8f039fd9bc.tar.gz device_samsung_crespo-07248e51c6721d21f399a37912959c8f039fd9bc.tar.bz2 | |
resolved conflicts for merge of 0ea9ad81 to gingerbread-plus-aosp
Change-Id: I6d87fd917228920ebf87ae7d4fd178a431ab33fe
Diffstat (limited to 'libcamera')
0 files changed, 0 insertions, 0 deletions