summaryrefslogtreecommitdiffstats
path: root/media/mtp/MtpServer.cpp
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2013-01-30 18:59:49 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-30 18:59:49 -0800
commit92b2bbbb79eb89fe4262c354e8d183c2ba325111 (patch)
tree457c9994632ea32728c854fd187d90eb43bc1e09 /media/mtp/MtpServer.cpp
parentaedbae565d74cad0988348d95c0500e39604cdb9 (diff)
parentc3afe5591a5c3a1aaf1cdcdeded75f6cff931569 (diff)
downloadframeworks_av-92b2bbbb79eb89fe4262c354e8d183c2ba325111.zip
frameworks_av-92b2bbbb79eb89fe4262c354e8d183c2ba325111.tar.gz
frameworks_av-92b2bbbb79eb89fe4262c354e8d183c2ba325111.tar.bz2
am c3afe559: (-s ours) am 9b7e8fc7: Camera2: Fix JPEG quality metadata type, new warnings.: DO NOT MERGE
# Via Android Git Automerger (1) and Igor Murashkin (1) * commit 'c3afe5591a5c3a1aaf1cdcdeded75f6cff931569': Camera2: Fix JPEG quality metadata type, new warnings.: DO NOT MERGE
Diffstat (limited to 'media/mtp/MtpServer.cpp')
0 files changed, 0 insertions, 0 deletions