diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-10-31 09:22:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-31 09:22:41 -0700 |
| commit | ee7352f160e3813a201010cf4a68972d0bac8420 (patch) | |
| tree | 29c084c65d0e4fc4181ca9a1c80b62b60321a013 /services/camera/libcameraservice/Camera2Client.cpp | |
| parent | 77536f9f8fc030379102c9e36ad21ce5b2ab234c (diff) | |
| parent | f0e55de3b1b099c413d430d8f9d46361454c85d2 (diff) | |
| download | frameworks_av-ee7352f160e3813a201010cf4a68972d0bac8420.zip frameworks_av-ee7352f160e3813a201010cf4a68972d0bac8420.tar.gz frameworks_av-ee7352f160e3813a201010cf4a68972d0bac8420.tar.bz2 | |
am f0e55de3: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'f0e55de3b1b099c413d430d8f9d46361454c85d2':
Diffstat (limited to 'services/camera/libcameraservice/Camera2Client.cpp')
0 files changed, 0 insertions, 0 deletions