diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-05-12 17:10:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-12 17:10:04 +0000 |
| commit | d0e25a2529584b07e4fe3544f973c6b0ebda7fc3 (patch) | |
| tree | e59d9497976b71d5860f5939a7e4f6f9e7e7a0ee /services/camera/libcameraservice/CameraService.h | |
| parent | 28e8ef72dab287af59663b89b12507e43f760701 (diff) | |
| parent | 022ed72e650f756288492ac7a10a7b41e0b14f82 (diff) | |
| download | frameworks_av-d0e25a2529584b07e4fe3544f973c6b0ebda7fc3.zip frameworks_av-d0e25a2529584b07e4fe3544f973c6b0ebda7fc3.tar.gz frameworks_av-d0e25a2529584b07e4fe3544f973c6b0ebda7fc3.tar.bz2 | |
Merge "mediaresourcemanager: change resource manager service log to use ring buffer." into mnc-dev
Diffstat (limited to 'services/camera/libcameraservice/CameraService.h')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index a8b4c4a..8df746a 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -38,9 +38,9 @@ #include "CameraFlashlight.h" #include "common/CameraModule.h" +#include "media/RingBuffer.h" #include "utils/AutoConditionLock.h" #include "utils/ClientManager.h" -#include "utils/RingBuffer.h" #include <set> #include <string> |