diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-09-22 15:57:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-22 15:57:05 -0700 |
| commit | 65769f5966d86278cccab3f43e2b67f499de4314 (patch) | |
| tree | 83c9c437605b2581db08685fd13a20ba65e90cd2 /android/camera/camera-common.h | |
| parent | d5e95c923ee83fbb08a4b0b38f20df1513883c12 (diff) | |
| parent | 16d2d4368c404a3a60f92e120ee889d36aaa3ebb (diff) | |
| download | external_qemu-65769f5966d86278cccab3f43e2b67f499de4314.zip external_qemu-65769f5966d86278cccab3f43e2b67f499de4314.tar.gz external_qemu-65769f5966d86278cccab3f43e2b67f499de4314.tar.bz2 | |
am 16d2d436: (-s ours) Merge from e3b840cf on master. Do not merge.
* commit '16d2d4368c404a3a60f92e120ee889d36aaa3ebb':
Merge from e3b840cf on master. Do not merge.
Diffstat (limited to 'android/camera/camera-common.h')
0 files changed, 0 insertions, 0 deletions