diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-18 02:08:46 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-18 02:08:46 +0100 |
| commit | 185e2110a53feb7720d91b6f8366ad27402f21cc (patch) | |
| tree | a265317b5846eec34d7c87b494ede81857e6c2d3 /services/camera/libcameraservice/common/Camera2ClientBase.h | |
| parent | d4590dda7776ec99e4e879c47b3372a5f4b13dcd (diff) | |
| parent | 8c2e9d8867ccaba1a617f133b37103e2ac77e871 (diff) | |
| download | frameworks_av-185e2110a53feb7720d91b6f8366ad27402f21cc.zip frameworks_av-185e2110a53feb7720d91b6f8366ad27402f21cc.tar.gz frameworks_av-185e2110a53feb7720d91b6f8366ad27402f21cc.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_av into replicant-6.0replicant-6.0-alpha-0005replicant-6.0-alpha-0004
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'services/camera/libcameraservice/common/Camera2ClientBase.h')
| -rw-r--r-- | services/camera/libcameraservice/common/Camera2ClientBase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/common/Camera2ClientBase.h b/services/camera/libcameraservice/common/Camera2ClientBase.h index 220c5ad..4568af0 100644 --- a/services/camera/libcameraservice/common/Camera2ClientBase.h +++ b/services/camera/libcameraservice/common/Camera2ClientBase.h @@ -57,7 +57,7 @@ public: virtual ~Camera2ClientBase(); virtual status_t initialize(CameraModule *module); - virtual status_t dump(int fd, const Vector<String16>& args); + virtual status_t dumpClient(int fd, const Vector<String16>& args); /** * CameraDeviceBase::NotificationListener implementation |