diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-11 13:47:53 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-02-11 13:53:20 +0000 |
| commit | 1d6fa7af1288b550faabe4ec2cf98684236723db (patch) | |
| tree | a8801ca9a0925ba1faccf17acea4aa78d71a9d29 /camera | |
| parent | b82a9f105f89d6b3684c9f626918042bd8977912 (diff) | |
| parent | 566be7c33fc56ae4c34168ecbee5316374f7e3c5 (diff) | |
| download | frameworks_av-1d6fa7af1288b550faabe4ec2cf98684236723db.zip frameworks_av-1d6fa7af1288b550faabe4ec2cf98684236723db.tar.gz frameworks_av-1d6fa7af1288b550faabe4ec2cf98684236723db.tar.bz2 | |
resolved conflicts for merge of 566be7c3 to master
Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/CameraParameters.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index c51f265..af091f4 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -470,7 +470,7 @@ status_t CameraParameters::dump(int fd, const Vector<String16>& args) const const size_t SIZE = 256; char buffer[SIZE]; String8 result; - snprintf(buffer, 255, "CameraParameters::dump: mMap.size = %d\n", mMap.size()); + snprintf(buffer, 255, "CameraParameters::dump: mMap.size = %zu\n", mMap.size()); result.append(buffer); for (size_t i = 0; i < mMap.size(); i++) { String8 k, v; |