summaryrefslogtreecommitdiffstats
path: root/media/libnbaio
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-02-11 13:47:53 +0000
committerNarayan Kamath <narayan@google.com>2014-02-11 13:53:20 +0000
commit1d6fa7af1288b550faabe4ec2cf98684236723db (patch)
treea8801ca9a0925ba1faccf17acea4aa78d71a9d29 /media/libnbaio
parentb82a9f105f89d6b3684c9f626918042bd8977912 (diff)
parent566be7c33fc56ae4c34168ecbee5316374f7e3c5 (diff)
downloadframeworks_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 'media/libnbaio')
-rw-r--r--media/libnbaio/NBLog.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libnbaio/NBLog.cpp b/media/libnbaio/NBLog.cpp
index ba8d0b4..190824d 100644
--- a/media/libnbaio/NBLog.cpp
+++ b/media/libnbaio/NBLog.cpp
@@ -340,7 +340,7 @@ void NBLog::Reader::dump(int fd, size_t indent)
if (i > 0) {
lost += i;
if (fd >= 0) {
- fdprintf(fd, "%*swarning: lost %u bytes worth of events\n", indent, "", lost);
+ fdprintf(fd, "%*swarning: lost %zu bytes worth of events\n", indent, "", lost);
} else {
ALOGI("%*swarning: lost %u bytes worth of events\n", indent, "", lost);
}