am 9aaa620b: Merge "EmulatedFakeCamera2: Support (0,0) jpeg thumbnail size." into jb-mr1-dev

* commit '9aaa620bdbb43b34d16ef81595ad1ffbcb3a863c': EmulatedFakeCamera2: Support (0,0) jpeg thumbnail size.
2012-08-28 16:57:20 -07:00
parent 92841986ea 9aaa620bdb
commit c296774352
1 changed files with 1 additions and 0 deletions
--- a/tools/emulator/system/camera/EmulatedFakeCamera2.cpp
+++ b/tools/emulator/system/camera/EmulatedFakeCamera2.cpp
@@ -1739,6 +1739,7 @@ status_t EmulatedFakeCamera2::constructStaticInfo(
    // android.jpeg

    static const int32_t jpegThumbnailSizes[] = {
+            0, 0,
            160, 120,
            320, 240
     };