)]}' { "log": [ { "commit": "1c84cb0bd8bc404afd35618a1c34200abce6aa8e", "tree": "3750e6e3235f6f6218e6780a50a8e46416602c46", "parents": [ "04c0891039fcb581461510c7a608793a035abbfb", "ef8532b0ae4a34f02f824ba0c0f3e8d4db2067e1" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Aug 08 09:46:19 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 08 09:46:19 2012 -0700" }, "message": "am ef8532b0: am e2229fba: Merge \"Handle empty stsc box\" into jb-mr1-dev\n\n* commit \u0027ef8532b0ae4a34f02f824ba0c0f3e8d4db2067e1\u0027:\n Handle empty stsc box\n" }, { "commit": "ef8532b0ae4a34f02f824ba0c0f3e8d4db2067e1", "tree": "c9896144a6719480f828d568319c81f0bba9a2ca", "parents": [ "876b7b50b4474c03105012f896e4227f0cacf024", "e2229fba1c7e98c243ea777f567fd72579d91e41" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Aug 08 09:45:30 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 08 09:45:30 2012 -0700" }, "message": "am e2229fba: Merge \"Handle empty stsc box\" into jb-mr1-dev\n\n* commit \u0027e2229fba1c7e98c243ea777f567fd72579d91e41\u0027:\n Handle empty stsc box\n" }, { "commit": "e2229fba1c7e98c243ea777f567fd72579d91e41", "tree": "c9896144a6719480f828d568319c81f0bba9a2ca", "parents": [ "a9e0ea58738a50de84a80d3b4db1936e7433dce4", "b7e75cfd64893dde230dfc1c3b281a00ca1b4470" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Aug 08 09:43:26 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 08 09:43:26 2012 -0700" }, "message": "Merge \"Handle empty stsc box\" into jb-mr1-dev" }, { "commit": "b7e75cfd64893dde230dfc1c3b281a00ca1b4470", "tree": "1ed2135b58a8762cdefda74197ea688a50b907b5", "parents": [ "28620ee3e9926ef07f0b4cb3e22b156b812e2d7e" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Aug 08 09:19:05 2012 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Aug 08 09:19:05 2012 -0700" }, "message": "Handle empty stsc box\n\nChange-Id: I867e2499fac3045075654aaaecf44327753327fd\n" }, { "commit": "04c0891039fcb581461510c7a608793a035abbfb", "tree": "a4dc46a7c6d7acff9c31237b595b58a04b77e834", "parents": [ "90041f7f24bfb9e1dc5e57ca51d39d83487fcb2a", "876b7b50b4474c03105012f896e4227f0cacf024" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Aug 08 08:18:51 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 08 08:18:51 2012 -0700" }, "message": "am 876b7b50: (-s ours) Reconcile with jb-mr1-release - do not merge\n\n* commit \u0027876b7b50b4474c03105012f896e4227f0cacf024\u0027:\n" }, { "commit": "876b7b50b4474c03105012f896e4227f0cacf024", "tree": "d107c25c3bc97a6cb1f25fb00aeb10a2882d5f26", "parents": [ "7047e4aff7402cbc1738f041f9777550e1bd087c", "ba668e07d2ab01a95a9ef941e17483199d53ffe8" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Aug 08 08:16:39 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Aug 08 08:16:40 2012 -0700" }, "message": "Reconcile with jb-mr1-release - do not merge\n\nChange-Id: I3bafd77a8fe73cc617dda88332b1a403f4803402\n" }, { "commit": "ba668e07d2ab01a95a9ef941e17483199d53ffe8", "tree": "d107c25c3bc97a6cb1f25fb00aeb10a2882d5f26", "parents": [ "a9e0ea58738a50de84a80d3b4db1936e7433dce4", "f5043b0c0759993967c4f075a658ffe9b79cd49a" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Aug 08 06:47:07 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Aug 08 06:47:07 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "90041f7f24bfb9e1dc5e57ca51d39d83487fcb2a", "tree": "a4dc46a7c6d7acff9c31237b595b58a04b77e834", "parents": [ "3c93934640cdf03881933e2a4fa53236124dec7c", "7047e4aff7402cbc1738f041f9777550e1bd087c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Aug 07 15:23:08 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 07 15:23:08 2012 -0700" }, "message": "am 7047e4af: am a9e0ea58: Merge \"Remove the no longer used PV software aac decoder.\" into jb-mr1-dev\n\n* commit \u00277047e4aff7402cbc1738f041f9777550e1bd087c\u0027:\n Remove the no longer used PV software aac decoder.\n" }, { "commit": "3c93934640cdf03881933e2a4fa53236124dec7c", "tree": "88f776c2c5ce1305031600b45136c2b377e979c7", "parents": [ "659667c27cfe12e071b0754f39bdaf3e3f415156", "b01b83c8755738f8e9d4beae32165fae458972a4" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Aug 07 15:22:38 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 07 15:22:38 2012 -0700" }, "message": "am b01b83c8: am 51d75479: Only emit padding at the end of the stream in the aac and mp3 decoders\n\n* commit \u0027b01b83c8755738f8e9d4beae32165fae458972a4\u0027:\n Only emit padding at the end of the stream in the aac and mp3 decoders\n" }, { "commit": "7047e4aff7402cbc1738f041f9777550e1bd087c", "tree": "d107c25c3bc97a6cb1f25fb00aeb10a2882d5f26", "parents": [ "b01b83c8755738f8e9d4beae32165fae458972a4", "a9e0ea58738a50de84a80d3b4db1936e7433dce4" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Aug 07 15:18:53 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 07 15:18:53 2012 -0700" }, "message": "am a9e0ea58: Merge \"Remove the no longer used PV software aac decoder.\" into jb-mr1-dev\n\n* commit \u0027a9e0ea58738a50de84a80d3b4db1936e7433dce4\u0027:\n Remove the no longer used PV software aac decoder.\n" }, { "commit": "a9e0ea58738a50de84a80d3b4db1936e7433dce4", "tree": "d107c25c3bc97a6cb1f25fb00aeb10a2882d5f26", "parents": [ "51d7547944967d1157b7fe18e1fb8f7ee6810412", "1f8834711f23f66d528aca98cca9602fb18cab66" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Aug 07 15:17:19 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 07 15:17:19 2012 -0700" }, "message": "Merge \"Remove the no longer used PV software aac decoder.\" into jb-mr1-dev" }, { "commit": "b01b83c8755738f8e9d4beae32165fae458972a4", "tree": "5c5d6cb884a163c7ea1f23899776f856fefbd1fa", "parents": [ "50f4109edda29b791a2fb7ed39be315c31610f3f", "51d7547944967d1157b7fe18e1fb8f7ee6810412" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Aug 07 14:49:39 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 07 14:49:39 2012 -0700" }, "message": "am 51d75479: Only emit padding at the end of the stream in the aac and mp3 decoders\n\n* commit \u002751d7547944967d1157b7fe18e1fb8f7ee6810412\u0027:\n Only emit padding at the end of the stream in the aac and mp3 decoders\n" }, { "commit": "1f8834711f23f66d528aca98cca9602fb18cab66", "tree": "63625d311b37da5455e58e76fa8ab62612f924ee", "parents": [ "e671207115fac3914134c61b336d5fa0242c68ca" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Aug 07 14:41:05 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Aug 07 14:41:05 2012 -0700" }, "message": "Remove the no longer used PV software aac decoder.\n\nChange-Id: Ia260f706780b66dc16a108aaa8780f68970380bd\n" }, { "commit": "51d7547944967d1157b7fe18e1fb8f7ee6810412", "tree": "5c5d6cb884a163c7ea1f23899776f856fefbd1fa", "parents": [ "e671207115fac3914134c61b336d5fa0242c68ca" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Aug 07 14:24:00 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Aug 07 14:24:00 2012 -0700" }, "message": "Only emit padding at the end of the stream in the aac and mp3 decoders\n\nif we actually discarded content at the beginning of the stream.\n\nChange-Id: I1e79835bb3a02350060a137b94f85f2c90f4a12b\n" }, { "commit": "659667c27cfe12e071b0754f39bdaf3e3f415156", "tree": "70a23931c891fe91143a5fc9302bf051d7dfe66f", "parents": [ "1498d1924d0075bd54410ea2c295b1aa92ed7ad6", "50f4109edda29b791a2fb7ed39be315c31610f3f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Aug 07 13:26:13 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 07 13:26:13 2012 -0700" }, "message": "am 50f4109e: am e6712071: Make sure codec names and corresponding quirks are returned together.\n\n* commit \u002750f4109edda29b791a2fb7ed39be315c31610f3f\u0027:\n Make sure codec names and corresponding quirks are returned together.\n" }, { "commit": "50f4109edda29b791a2fb7ed39be315c31610f3f", "tree": "466cda101e1528b81bf72c228d7060c33788dedf", "parents": [ "119254b2707cbaf11fd1eaffdeaebb3e022ad8d0", "e671207115fac3914134c61b336d5fa0242c68ca" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Aug 07 13:24:11 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 07 13:24:11 2012 -0700" }, "message": "am e6712071: Make sure codec names and corresponding quirks are returned together.\n\n* commit \u0027e671207115fac3914134c61b336d5fa0242c68ca\u0027:\n Make sure codec names and corresponding quirks are returned together.\n" }, { "commit": "e671207115fac3914134c61b336d5fa0242c68ca", "tree": "466cda101e1528b81bf72c228d7060c33788dedf", "parents": [ "28620ee3e9926ef07f0b4cb3e22b156b812e2d7e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jun 26 10:56:14 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Aug 07 13:08:15 2012 -0700" }, "message": "Make sure codec names and corresponding quirks are returned together.\n\nPreviously they were returned in separate vectors and only one of them was sorted if\nsoftware codecs were preferred, leaving the quirks no longer matching the codec name\nat the same index.\n\nChange-Id: Id3f1e6f9f7f8c9cc4b6ebfb86a203b4d59de8604\nrelated-to-bug: 6737884\n" }, { "commit": "1498d1924d0075bd54410ea2c295b1aa92ed7ad6", "tree": "13e84caf3ebace6e336fb479dcfbc6dbacffa743", "parents": [ "1f359b58135c9078011a44ede05baef362e1feac", "119254b2707cbaf11fd1eaffdeaebb3e022ad8d0" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Aug 07 11:43:48 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 07 11:43:48 2012 -0700" }, "message": "am 119254b2: am 28620ee3: Merge \"mediacodec: Return an error on getOutputFormat if there is no output format yet\" into jb-mr1-dev\n\n* commit \u0027119254b2707cbaf11fd1eaffdeaebb3e022ad8d0\u0027:\n mediacodec: Return an error on getOutputFormat if there is no output format yet\n" }, { "commit": "119254b2707cbaf11fd1eaffdeaebb3e022ad8d0", "tree": "9b86960e4b0b76e5d11987de8d51e4ec9fc103a0", "parents": [ "0624f9120951494881236195237b94a96838db6f", "28620ee3e9926ef07f0b4cb3e22b156b812e2d7e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Aug 07 11:42:07 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 07 11:42:07 2012 -0700" }, "message": "am 28620ee3: Merge \"mediacodec: Return an error on getOutputFormat if there is no output format yet\" into jb-mr1-dev\n\n* commit \u002728620ee3e9926ef07f0b4cb3e22b156b812e2d7e\u0027:\n mediacodec: Return an error on getOutputFormat if there is no output format yet\n" }, { "commit": "28620ee3e9926ef07f0b4cb3e22b156b812e2d7e", "tree": "9b86960e4b0b76e5d11987de8d51e4ec9fc103a0", "parents": [ "42c5ef98bd09e7d93610d4ca1f4959b63bc3267d", "972f2321583ef4094477271e0fc6a1d05a1a0eea" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Aug 07 11:40:04 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 07 11:40:05 2012 -0700" }, "message": "Merge \"mediacodec: Return an error on getOutputFormat if there is no output format yet\" into jb-mr1-dev" }, { "commit": "972f2321583ef4094477271e0fc6a1d05a1a0eea", "tree": "ae5c8ddade5a100486d8a989c7c4d755b7908d60", "parents": [ "97197157cf619fb716710eb67915fdfa93502750" ], "author": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Fri Jul 13 12:48:19 2012 +0300" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Aug 07 11:08:12 2012 -0700" }, "message": "mediacodec: Return an error on getOutputFormat if there is no output format yet\n\nThis avoids crashing if calling the public java method\nMediaCodec.getOutputFormat immediately after MediaCodec.start\n(as the documentation example shows that one should do!).\n\nChange-Id: Icd3dd7ab9ae9e8f2a67cef171ff176735de95f58\n" }, { "commit": "1f359b58135c9078011a44ede05baef362e1feac", "tree": "6d2f2ddd8169f8477154a1bc4a85dd0eeb10486b", "parents": [ "e90b7d5b28bb4c192be215f64269d23c9ed6c102", "0624f9120951494881236195237b94a96838db6f" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Aug 07 11:05:49 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 07 11:05:49 2012 -0700" }, "message": "am 0624f912: (-s ours) Reconcile with jb-mr1-release - do not merge\n\n* commit \u00270624f9120951494881236195237b94a96838db6f\u0027:\n" }, { "commit": "0624f9120951494881236195237b94a96838db6f", "tree": "ea68ebae1f07a2257daa1e45f2d7503e9bf0effa", "parents": [ "1b782a946da7612686a5090f58cb5daae0eb4b79", "f5043b0c0759993967c4f075a658ffe9b79cd49a" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Aug 07 11:03:26 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Aug 07 11:03:26 2012 -0700" }, "message": "Reconcile with jb-mr1-release - do not merge\n\nChange-Id: I8ad298c8a095bcd2eed529e719b98782fc506dda\n" }, { "commit": "e90b7d5b28bb4c192be215f64269d23c9ed6c102", "tree": "6d2f2ddd8169f8477154a1bc4a85dd0eeb10486b", "parents": [ "0ae81b65f28ebbd2d713d66ef59e7cf0d99e60a1", "1b782a946da7612686a5090f58cb5daae0eb4b79" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Aug 07 10:17:35 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 07 10:17:35 2012 -0700" }, "message": "am 1b782a94: am 42c5ef98: Merge \"Remove obsolete hack for TI specific code\" into jb-mr1-dev\n\n* commit \u00271b782a946da7612686a5090f58cb5daae0eb4b79\u0027:\n Remove obsolete hack for TI specific code\n" }, { "commit": "1b782a946da7612686a5090f58cb5daae0eb4b79", "tree": "ea68ebae1f07a2257daa1e45f2d7503e9bf0effa", "parents": [ "cb6687718a8952afb26e5084da3f23ac972b04a1", "42c5ef98bd09e7d93610d4ca1f4959b63bc3267d" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Aug 07 10:14:33 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 07 10:14:33 2012 -0700" }, "message": "am 42c5ef98: Merge \"Remove obsolete hack for TI specific code\" into jb-mr1-dev\n\n* commit \u002742c5ef98bd09e7d93610d4ca1f4959b63bc3267d\u0027:\n Remove obsolete hack for TI specific code\n" }, { "commit": "42c5ef98bd09e7d93610d4ca1f4959b63bc3267d", "tree": "ea68ebae1f07a2257daa1e45f2d7503e9bf0effa", "parents": [ "97197157cf619fb716710eb67915fdfa93502750", "a6ee7bc5f9524c220377e37f6525e2d46c69b75b" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Aug 07 10:12:48 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 07 10:12:49 2012 -0700" }, "message": "Merge \"Remove obsolete hack for TI specific code\" into jb-mr1-dev" }, { "commit": "f5043b0c0759993967c4f075a658ffe9b79cd49a", "tree": "2226298f6d10b7744b1808308a89b77f03653e3e", "parents": [ "97197157cf619fb716710eb67915fdfa93502750", "fcbb8af593db05b2041c69ea9db8bcb6b9b899d5" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Aug 07 06:33:55 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Aug 07 06:33:55 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "a6ee7bc5f9524c220377e37f6525e2d46c69b75b", "tree": "a400db737ac5e0c2bb7961fef314bbb975656eef", "parents": [ "8da4cd7d706d9f551bf2d08cd8b61907a10cd38d" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Aug 06 22:02:27 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Aug 06 22:03:28 2012 -0700" }, "message": "Remove obsolete hack for TI specific code\n\no related-to-bug: 6566886\n\nChange-Id: I39aad214cbf7b748a95a9d22db50cd8f421931e6\n" }, { "commit": "0ae81b65f28ebbd2d713d66ef59e7cf0d99e60a1", "tree": "22c74d0e15568fa6982e17cd8a1156d9c13a6339", "parents": [ "b57981c665cd5e369e880dc942d6adcbb746547c", "cb6687718a8952afb26e5084da3f23ac972b04a1" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Aug 06 16:01:47 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 06 16:01:47 2012 -0700" }, "message": "am cb668771: am 97197157: Camera2: Reduce redundant device dumpsys\n\n* commit \u0027cb6687718a8952afb26e5084da3f23ac972b04a1\u0027:\n Camera2: Reduce redundant device dumpsys\n" }, { "commit": "cb6687718a8952afb26e5084da3f23ac972b04a1", "tree": "2226298f6d10b7744b1808308a89b77f03653e3e", "parents": [ "caa99d67db399278fceee1deee54a18fa7756989", "97197157cf619fb716710eb67915fdfa93502750" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Aug 06 15:59:36 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 06 15:59:36 2012 -0700" }, "message": "am 97197157: Camera2: Reduce redundant device dumpsys\n\n* commit \u002797197157cf619fb716710eb67915fdfa93502750\u0027:\n Camera2: Reduce redundant device dumpsys\n" }, { "commit": "97197157cf619fb716710eb67915fdfa93502750", "tree": "2226298f6d10b7744b1808308a89b77f03653e3e", "parents": [ "8da4cd7d706d9f551bf2d08cd8b61907a10cd38d" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Aug 06 14:25:19 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Aug 06 14:27:11 2012 -0700" }, "message": "Camera2: Reduce redundant device dumpsys\n\nBug: 6243944\nChange-Id: Ifdc15ee62156a7adfd133f0d0d8b772dd1e9d5a3\n" }, { "commit": "b57981c665cd5e369e880dc942d6adcbb746547c", "tree": "a352c67d0eacc19da2c51d35a6882835de418507", "parents": [ "7177a6aeac8eff88bf41824dd794c48c1522b716", "caa99d67db399278fceee1deee54a18fa7756989" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Aug 06 13:35:37 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 06 13:35:37 2012 -0700" }, "message": "am caa99d67: (-s ours) Reconcile with jb-mr1-release - do not merge\n\n* commit \u0027caa99d67db399278fceee1deee54a18fa7756989\u0027:\n Fix a deadlock in commandSetVideoBufferCountL()\n" }, { "commit": "caa99d67db399278fceee1deee54a18fa7756989", "tree": "d859052f6839fedf654ce8cea7dea2d567ad710f", "parents": [ "68cdf704ba1fa342eda8b76de58f8107bff78ba3", "fcbb8af593db05b2041c69ea9db8bcb6b9b899d5" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Aug 06 13:34:31 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Aug 06 13:34:31 2012 -0700" }, "message": "Reconcile with jb-mr1-release - do not merge\n\nChange-Id: I9a3c5b3e910cd2ba0b1be72e8f87ff2aba8894c4\n" }, { "commit": "7177a6aeac8eff88bf41824dd794c48c1522b716", "tree": "a352c67d0eacc19da2c51d35a6882835de418507", "parents": [ "ce818f883a094483f823cffd45106e1603ac5805", "68cdf704ba1fa342eda8b76de58f8107bff78ba3" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Aug 06 13:23:31 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 06 13:23:31 2012 -0700" }, "message": "am 68cdf704: (-s ours) Reconcile with jb-mr1-release - do not merge\n\n* commit \u002768cdf704ba1fa342eda8b76de58f8107bff78ba3\u0027:\n" }, { "commit": "68cdf704ba1fa342eda8b76de58f8107bff78ba3", "tree": "d859052f6839fedf654ce8cea7dea2d567ad710f", "parents": [ "da608d59a12509835ecd097ecc0abb2f7ab16a26", "7ec57375431dba04e613610e2090130b44ee80c1" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Aug 06 13:20:21 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Aug 06 13:20:21 2012 -0700" }, "message": "Reconcile with jb-mr1-release - do not merge\n\nChange-Id: I8bec453341c0b30589f376e431362cd7a8e20cd1\n" }, { "commit": "fcbb8af593db05b2041c69ea9db8bcb6b9b899d5", "tree": "c7a936124cb4fef69a0d4037799bae92d5118e27", "parents": [ "7ec57375431dba04e613610e2090130b44ee80c1" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sat Aug 04 19:58:07 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Aug 06 13:06:28 2012 -0700" }, "message": "Fix a deadlock in commandSetVideoBufferCountL()\n\no The lock to be acquired in recordingEnabled() has aleady been acquired in sendCommand()\n before the call to commandSetVideoBufferCountL().\n\nChange-Id: I664d51ef449c9eb3576d5d56f73f29c98444ff3f\n" }, { "commit": "7ec57375431dba04e613610e2090130b44ee80c1", "tree": "baa6bc04da0a672f11ca6dd8fd5007b9776f466a", "parents": [ "e643ccba8b8476595ab353c9bcecc8863c53242e", "cda97f7435e685a2d717c40db03ece6c709578f1" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Aug 06 06:28:11 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Aug 06 06:28:11 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "ce818f883a094483f823cffd45106e1603ac5805", "tree": "a352c67d0eacc19da2c51d35a6882835de418507", "parents": [ "c01e93e4534ddb45c9897192c2ef3a1be8c51943", "da608d59a12509835ecd097ecc0abb2f7ab16a26" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sun Aug 05 16:14:03 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Aug 05 16:14:03 2012 -0700" }, "message": "am da608d59: am 8da4cd7d: Fix a deadlock in commandSetVideoBufferCountL()\n\n* commit \u0027da608d59a12509835ecd097ecc0abb2f7ab16a26\u0027:\n Fix a deadlock in commandSetVideoBufferCountL()\n" }, { "commit": "da608d59a12509835ecd097ecc0abb2f7ab16a26", "tree": "d859052f6839fedf654ce8cea7dea2d567ad710f", "parents": [ "7dad0e96cf7a9e9933aeac69623be8c31497e656", "8da4cd7d706d9f551bf2d08cd8b61907a10cd38d" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sun Aug 05 16:12:34 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Aug 05 16:12:34 2012 -0700" }, "message": "am 8da4cd7d: Fix a deadlock in commandSetVideoBufferCountL()\n\n* commit \u00278da4cd7d706d9f551bf2d08cd8b61907a10cd38d\u0027:\n Fix a deadlock in commandSetVideoBufferCountL()\n" }, { "commit": "8da4cd7d706d9f551bf2d08cd8b61907a10cd38d", "tree": "d859052f6839fedf654ce8cea7dea2d567ad710f", "parents": [ "d9f0253353db0b859c0ca2b32eddc24e3e9d4d86" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sat Aug 04 19:58:07 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Sat Aug 04 20:46:14 2012 -0700" }, "message": "Fix a deadlock in commandSetVideoBufferCountL()\n\no The lock to be acquired in recordingEnabled() has aleady been acquired in sendCommand()\n before the call to commandSetVideoBufferCountL().\n\nChange-Id: I664d51ef449c9eb3576d5d56f73f29c98444ff3f\n" }, { "commit": "c01e93e4534ddb45c9897192c2ef3a1be8c51943", "tree": "7cfce17210e424bfba8530ed5c26461031e6f2a0", "parents": [ "98f12500dbcb34335392f5177048b7b0f69741ab", "7dad0e96cf7a9e9933aeac69623be8c31497e656" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Aug 03 23:25:34 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 03 23:25:34 2012 -0700" }, "message": "am 7dad0e96: am d9f02533: Merge \"Camera2: Add notification handling skeleton.\" into jb-mr1-dev\n\n* commit \u00277dad0e96cf7a9e9933aeac69623be8c31497e656\u0027:\n Camera2: Add notification handling skeleton.\n" }, { "commit": "7dad0e96cf7a9e9933aeac69623be8c31497e656", "tree": "ae007c2294b510ab384be44f09324c922cbd7958", "parents": [ "b81dcd5a3e9508def58a7f79a110d37ca27aebf9", "d9f0253353db0b859c0ca2b32eddc24e3e9d4d86" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Aug 03 23:23:23 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 03 23:23:23 2012 -0700" }, "message": "am d9f02533: Merge \"Camera2: Add notification handling skeleton.\" into jb-mr1-dev\n\n* commit \u0027d9f0253353db0b859c0ca2b32eddc24e3e9d4d86\u0027:\n Camera2: Add notification handling skeleton.\n" }, { "commit": "d9f0253353db0b859c0ca2b32eddc24e3e9d4d86", "tree": "ae007c2294b510ab384be44f09324c922cbd7958", "parents": [ "e643ccba8b8476595ab353c9bcecc8863c53242e", "160d4af9d933fe9461bb213e5876fc5c8c2178c2" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Aug 03 23:21:16 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 03 23:21:17 2012 -0700" }, "message": "Merge \"Camera2: Add notification handling skeleton.\" into jb-mr1-dev" }, { "commit": "98f12500dbcb34335392f5177048b7b0f69741ab", "tree": "e8e67f44c07af89c402c4b24b7e98908f2d11709", "parents": [ "1ebccf52559ee7249bfe25c1a7c0232f8bc8060f", "b81dcd5a3e9508def58a7f79a110d37ca27aebf9" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Fri Aug 03 17:50:54 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 03 17:50:54 2012 -0700" }, "message": "am b81dcd5a: am e643ccba: Merge \"Remove circular dependency.\" into jb-mr1-dev\n\n* commit \u0027b81dcd5a3e9508def58a7f79a110d37ca27aebf9\u0027:\n Remove circular dependency.\n" }, { "commit": "b81dcd5a3e9508def58a7f79a110d37ca27aebf9", "tree": "baa6bc04da0a672f11ca6dd8fd5007b9776f466a", "parents": [ "c9b125a1be3d1edcb8b7f050334ef3d3a980d3d1", "e643ccba8b8476595ab353c9bcecc8863c53242e" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Fri Aug 03 17:48:50 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 03 17:48:50 2012 -0700" }, "message": "am e643ccba: Merge \"Remove circular dependency.\" into jb-mr1-dev\n\n* commit \u0027e643ccba8b8476595ab353c9bcecc8863c53242e\u0027:\n Remove circular dependency.\n" }, { "commit": "e643ccba8b8476595ab353c9bcecc8863c53242e", "tree": "baa6bc04da0a672f11ca6dd8fd5007b9776f466a", "parents": [ "a3b71fa5235b758d5f9ea00b9c58fbfd707fb9dd", "8d5ec2a336c114688e5d2950b124440e07e79ad9" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Fri Aug 03 17:46:37 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 03 17:46:38 2012 -0700" }, "message": "Merge \"Remove circular dependency.\" into jb-mr1-dev" }, { "commit": "8d5ec2a336c114688e5d2950b124440e07e79ad9", "tree": "12bce370a9f92dca263a27fc32e768c4ab9774a5", "parents": [ "428b77a2b94b74665a47375b3fdb893b98d71269" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Fri Aug 03 17:42:01 2012 -0700" }, "committer": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Fri Aug 03 17:43:41 2012 -0700" }, "message": "Remove circular dependency.\n\nlibstagefright_chromium_http is added to build/target/product/core.mk\ninstead.\n\nBug: 6933259\nChange-Id: I2e87037eea0f1f2a56936dd02419cde564c8670d\n" }, { "commit": "160d4af9d933fe9461bb213e5876fc5c8c2178c2", "tree": "b69bfc44345106f724d8fe5febd48762720fe164", "parents": [ "36cdfb185877a7f573621d19ed2b2e1cac13d62e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Aug 03 09:40:16 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Aug 03 14:31:38 2012 -0700" }, "message": "Camera2: Add notification handling skeleton.\n\nWire up skeleton methods for handling all currently defined\nnotifications.\n\nBug: 6243944\nChange-Id: I84b3f60111416ba6fbcdb086f1310225142e2b70\n" }, { "commit": "1ebccf52559ee7249bfe25c1a7c0232f8bc8060f", "tree": "1a5eb5db7a9fe3e196bed3cf5a1346ccdfd637d4", "parents": [ "27644634ea54d48863e765d87e24d60153a6e795", "c9b125a1be3d1edcb8b7f050334ef3d3a980d3d1" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 03 14:20:20 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 03 14:20:20 2012 -0700" }, "message": "am c9b125a1: am a3b71fa5: Merge \"experimental support for fragmented mp4 playback in nuplayer\" into jb-mr1-dev\n\n* commit \u0027c9b125a1be3d1edcb8b7f050334ef3d3a980d3d1\u0027:\n experimental support for fragmented mp4 playback in nuplayer\n" }, { "commit": "c9b125a1be3d1edcb8b7f050334ef3d3a980d3d1", "tree": "74897f534787e1da1855a4b87f6de0aa3de278ac", "parents": [ "8e888ec75718db90d2e6b7e0ab3bea814e2dd3f0", "a3b71fa5235b758d5f9ea00b9c58fbfd707fb9dd" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 03 14:18:37 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 03 14:18:37 2012 -0700" }, "message": "am a3b71fa5: Merge \"experimental support for fragmented mp4 playback in nuplayer\" into jb-mr1-dev\n\n* commit \u0027a3b71fa5235b758d5f9ea00b9c58fbfd707fb9dd\u0027:\n experimental support for fragmented mp4 playback in nuplayer\n" }, { "commit": "a3b71fa5235b758d5f9ea00b9c58fbfd707fb9dd", "tree": "74897f534787e1da1855a4b87f6de0aa3de278ac", "parents": [ "36cdfb185877a7f573621d19ed2b2e1cac13d62e", "840667883fd09d44015716d79bc3ac4d60edc0f0" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 03 14:16:33 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 03 14:16:33 2012 -0700" }, "message": "Merge \"experimental support for fragmented mp4 playback in nuplayer\" into jb-mr1-dev" }, { "commit": "840667883fd09d44015716d79bc3ac4d60edc0f0", "tree": "cb55492dbe3ca64b2ab9ba2f5a3bb6d0a0bcf650", "parents": [ "9cb20d4a41eb84bfab7f9f0d0829393f378583f4" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Aug 16 09:34:26 2011 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 03 13:57:32 2012 -0700" }, "message": "experimental support for fragmented mp4 playback in nuplayer\n\ncherry picked from change 170999\n\nChange-Id: I407775f0290154ad4961134839a15c9f296424c0\n" }, { "commit": "27644634ea54d48863e765d87e24d60153a6e795", "tree": "23b16a7935ee56467a3f4d10fbee8877e6fc6223", "parents": [ "4b5412b6fe136a7391076c53eea6974c664ead91", "8e888ec75718db90d2e6b7e0ab3bea814e2dd3f0" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Aug 03 10:10:00 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 03 10:10:00 2012 -0700" }, "message": "am 8e888ec7: am 36cdfb18: Camera2: Break out individual commands\n\n* commit \u00278e888ec75718db90d2e6b7e0ab3bea814e2dd3f0\u0027:\n Camera2: Break out individual commands\n" }, { "commit": "8e888ec75718db90d2e6b7e0ab3bea814e2dd3f0", "tree": "dbb4713666c0f6cd1de3b1400325fada0fe05c1d", "parents": [ "903f037ae7e6161818cb3b2d662fd380a9d02499", "36cdfb185877a7f573621d19ed2b2e1cac13d62e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Aug 03 09:43:26 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 03 09:43:26 2012 -0700" }, "message": "am 36cdfb18: Camera2: Break out individual commands\n\n* commit \u002736cdfb185877a7f573621d19ed2b2e1cac13d62e\u0027:\n Camera2: Break out individual commands\n" }, { "commit": "36cdfb185877a7f573621d19ed2b2e1cac13d62e", "tree": "dbb4713666c0f6cd1de3b1400325fada0fe05c1d", "parents": [ "983cf231ab2d176a14595cdae46ff1b0c239af47" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 17:34:15 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 17:49:48 2012 -0700" }, "message": "Camera2: Break out individual commands\n\n- List all commands that need implementing in sendCommand\n- Write skeleton methods for each one\n- Implements playRecordingSound command\n- Partially implements enableShutterSound command\n\nBug: 6243944\nChange-Id: I7866df75adca09483f407d3a4f630e847dbc7721\n" }, { "commit": "4b5412b6fe136a7391076c53eea6974c664ead91", "tree": "faa2244bb1f59ec711247d1e45ee6048c01be15d", "parents": [ "76a794f66595390c21639b6af89a6efbfd564e06", "903f037ae7e6161818cb3b2d662fd380a9d02499" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Aug 02 17:24:14 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 17:24:14 2012 -0700" }, "message": "am 903f037a: am 983cf231: Dynamically configure the number of video buffers used by camera source, if supported\n\n* commit \u0027903f037ae7e6161818cb3b2d662fd380a9d02499\u0027:\n Dynamically configure the number of video buffers used by camera source, if supported\n" }, { "commit": "903f037ae7e6161818cb3b2d662fd380a9d02499", "tree": "01942a13a082e2116f8df5dbaca1a902ac52a299", "parents": [ "22c875ae3b06597dabf82e6464a36a82967a4e83", "983cf231ab2d176a14595cdae46ff1b0c239af47" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Aug 02 17:22:03 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 17:22:03 2012 -0700" }, "message": "am 983cf231: Dynamically configure the number of video buffers used by camera source, if supported\n\n* commit \u0027983cf231ab2d176a14595cdae46ff1b0c239af47\u0027:\n Dynamically configure the number of video buffers used by camera source, if supported\n" }, { "commit": "983cf231ab2d176a14595cdae46ff1b0c239af47", "tree": "01942a13a082e2116f8df5dbaca1a902ac52a299", "parents": [ "15d7245ed2193e4956ea87998321cbc16a3b0a46" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Aug 01 16:39:55 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Aug 02 17:06:05 2012 -0700" }, "message": "Dynamically configure the number of video buffers used by camera source, if supported\n\no related-to-bug: 6920805\n\nChange-Id: I413bb50954cc84e32ed40bcb713842dc7b58e2b6\n" }, { "commit": "76a794f66595390c21639b6af89a6efbfd564e06", "tree": "90c4ca73164311eeb3b45603960080d0a19a369a", "parents": [ "4d6a71d41a6bef57cc9ab81a95cfa975241486c8", "22c875ae3b06597dabf82e6464a36a82967a4e83" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 17:04:06 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 17:04:06 2012 -0700" }, "message": "am 22c875ae: am 15d7245e: Merge \"Camera2: Fix exposure compensation step value.\" into jb-mr1-dev\n\n* commit \u002722c875ae3b06597dabf82e6464a36a82967a4e83\u0027:\n Camera2: Fix exposure compensation step value.\n" }, { "commit": "4d6a71d41a6bef57cc9ab81a95cfa975241486c8", "tree": "a781fd06952d4d8f71d480650326a19b95bfb3c6", "parents": [ "27170d87c8fa4a730eb246868539660a060d0c4a", "3b1069c5e5b70cefc185d7ea498b15e8b12e8807" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 17:04:03 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 17:04:03 2012 -0700" }, "message": "am 3b1069c5: am 1bf1c000: Merge \"Camera2: Minor logging updates.\" into jb-mr1-dev\n\n* commit \u00273b1069c5e5b70cefc185d7ea498b15e8b12e8807\u0027:\n Camera2: Minor logging updates.\n" }, { "commit": "27170d87c8fa4a730eb246868539660a060d0c4a", "tree": "213e1dd390af00df6f0c4a9524b074490f98f312", "parents": [ "24c80c49eb55c7727af54d3a70206fd5341abe41", "028488ecb9bc16482e94beca8e27a2d409126648" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 17:04:02 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 17:04:02 2012 -0700" }, "message": "am 028488ec: am 4a76bcea: Merge \"Camera2: Check PIDs to ensure camera exclusive access.\" into jb-mr1-dev\n\n* commit \u0027028488ecb9bc16482e94beca8e27a2d409126648\u0027:\n Camera2: Check PIDs to ensure camera exclusive access.\n" }, { "commit": "22c875ae3b06597dabf82e6464a36a82967a4e83", "tree": "18f36b8fc450f4a0784bade5771b5bc20fbe9c94", "parents": [ "3b1069c5e5b70cefc185d7ea498b15e8b12e8807", "15d7245ed2193e4956ea87998321cbc16a3b0a46" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 17:02:11 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 17:02:11 2012 -0700" }, "message": "am 15d7245e: Merge \"Camera2: Fix exposure compensation step value.\" into jb-mr1-dev\n\n* commit \u002715d7245ed2193e4956ea87998321cbc16a3b0a46\u0027:\n Camera2: Fix exposure compensation step value.\n" }, { "commit": "3b1069c5e5b70cefc185d7ea498b15e8b12e8807", "tree": "d45f3a7e978671fe9097bc93f8c8ff42693bee0a", "parents": [ "028488ecb9bc16482e94beca8e27a2d409126648", "1bf1c000be916b5e3388ef9039beedda01fa2bdd" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 17:02:09 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 17:02:09 2012 -0700" }, "message": "am 1bf1c000: Merge \"Camera2: Minor logging updates.\" into jb-mr1-dev\n\n* commit \u00271bf1c000be916b5e3388ef9039beedda01fa2bdd\u0027:\n Camera2: Minor logging updates.\n" }, { "commit": "028488ecb9bc16482e94beca8e27a2d409126648", "tree": "ff109075175e3c1a8200fea09b2d3b28129ad21f", "parents": [ "c249e7b7f0b79879670ba70c24c2e9364a1e1720", "4a76bcea7a23356185c4fa9491d5a73256b80cd0" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 17:02:07 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 17:02:07 2012 -0700" }, "message": "am 4a76bcea: Merge \"Camera2: Check PIDs to ensure camera exclusive access.\" into jb-mr1-dev\n\n* commit \u00274a76bcea7a23356185c4fa9491d5a73256b80cd0\u0027:\n Camera2: Check PIDs to ensure camera exclusive access.\n" }, { "commit": "15d7245ed2193e4956ea87998321cbc16a3b0a46", "tree": "18f36b8fc450f4a0784bade5771b5bc20fbe9c94", "parents": [ "1bf1c000be916b5e3388ef9039beedda01fa2bdd", "d6f8e08a9ca7f2fe41717acd351426a7ecb0c175" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 17:01:07 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 02 17:01:07 2012 -0700" }, "message": "Merge \"Camera2: Fix exposure compensation step value.\" into jb-mr1-dev" }, { "commit": "1bf1c000be916b5e3388ef9039beedda01fa2bdd", "tree": "d45f3a7e978671fe9097bc93f8c8ff42693bee0a", "parents": [ "4a76bcea7a23356185c4fa9491d5a73256b80cd0", "750d74b0b64470dccdb7310bf33e0d0e582f2059" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 17:00:19 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 02 17:00:20 2012 -0700" }, "message": "Merge \"Camera2: Minor logging updates.\" into jb-mr1-dev" }, { "commit": "4a76bcea7a23356185c4fa9491d5a73256b80cd0", "tree": "ff109075175e3c1a8200fea09b2d3b28129ad21f", "parents": [ "ac9b96003da5dad9ae6fc8d054d7b24ef24693fe", "3a609147811105d40766f8f8f5904bf71cb123cb" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 16:59:41 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 02 16:59:41 2012 -0700" }, "message": "Merge \"Camera2: Check PIDs to ensure camera exclusive access.\" into jb-mr1-dev" }, { "commit": "d6f8e08a9ca7f2fe41717acd351426a7ecb0c175", "tree": "721dabfcc1ce1ea6dba72ce475e8940965a274be", "parents": [ "750d74b0b64470dccdb7310bf33e0d0e582f2059" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 16:00:35 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 16:51:48 2012 -0700" }, "message": "Camera2: Fix exposure compensation step value.\n\nFix floating-point divide error.\n\nChange-Id: I61b140c1090d6773b9b530d19a2ec03cf784b85e\n" }, { "commit": "750d74b0b64470dccdb7310bf33e0d0e582f2059", "tree": "b03bcb7d01335be267b46e1851e5e0c392fff4d9", "parents": [ "3a609147811105d40766f8f8f5904bf71cb123cb" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Aug 01 09:05:04 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 16:51:48 2012 -0700" }, "message": "Camera2: Minor logging updates.\n\nImprove double-verbose logging, report a few more errors/startup\nconditions.\n\nBug: 6243944\nChange-Id: I2e814f786b35f57b63220d1b7c39f39cb6c3ace3\n" }, { "commit": "3a609147811105d40766f8f8f5904bf71cb123cb", "tree": "27cc2e751e60d6daf4960efe47a3bc035376887c", "parents": [ "428b77a2b94b74665a47375b3fdb893b98d71269" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Jul 31 14:36:26 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 16:51:48 2012 -0700" }, "message": "Camera2: Check PIDs to ensure camera exclusive access.\n\nBug: 6243944\nChange-Id: I4b36af2c92b7266a4aa896a2b048c56b6406cb9a\n" }, { "commit": "24c80c49eb55c7727af54d3a70206fd5341abe41", "tree": "ec3772219c99934b6bb1a9e88cdbd9de5f8725c7", "parents": [ "987a7000fee7c14e48e732edb22e1cd8d69dfdd5", "c249e7b7f0b79879670ba70c24c2e9364a1e1720" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Aug 02 15:09:51 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 15:09:51 2012 -0700" }, "message": "am c249e7b7: am ac9b9600: Merge \"Allocate buffers before calling start on its source in OMXCodec::start() for encoder case\" into jb-mr1-dev\n\n* commit \u0027c249e7b7f0b79879670ba70c24c2e9364a1e1720\u0027:\n Allocate buffers before calling start on its source in OMXCodec::start() for encoder case\n" }, { "commit": "987a7000fee7c14e48e732edb22e1cd8d69dfdd5", "tree": "04a192c984360f002f74c8be947a50bd304b3c99", "parents": [ "35795504755b8b658eb0795beb9463c69101eea8", "dfc7371e43960a36018a1df41a1c7f1737480430" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 15:09:50 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 15:09:50 2012 -0700" }, "message": "am dfc7371e: am 9cb20d4a: am a9ab66c5: (-s ours) am ffd99cb7: Merge \"Shutter sound is heard at the end of the recorded video\"\n\n* commit \u0027dfc7371e43960a36018a1df41a1c7f1737480430\u0027:\n Shutter sound is heard at the end of the recorded video\n" }, { "commit": "35795504755b8b658eb0795beb9463c69101eea8", "tree": "04a192c984360f002f74c8be947a50bd304b3c99", "parents": [ "8d2794be0c65f93f19632e811343aab56bb51242", "f6f6cfc17f89350f37cee1549533778ade226437" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Aug 02 15:09:15 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 15:09:15 2012 -0700" }, "message": "am f6f6cfc1: (-s ours) Reconcile with jb-mr1-release - do not merge\n\n* commit \u0027f6f6cfc17f89350f37cee1549533778ade226437\u0027:\n" }, { "commit": "8d2794be0c65f93f19632e811343aab56bb51242", "tree": "04a192c984360f002f74c8be947a50bd304b3c99", "parents": [ "3a1eb965f72732936042d91f158c548e1f1f4411", "cc788456c867f8e97e40b0cb8dab58ce9db4a27b" ], "author": { "name": "Insun Kang", "email": "insun@google.com", "time": "Thu Aug 02 15:08:17 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 15:08:17 2012 -0700" }, "message": "am cc788456: am c9729ca1: Unifying TimedTextDriver\\\u0027s resume() and start().\n\n* commit \u0027cc788456c867f8e97e40b0cb8dab58ce9db4a27b\u0027:\n Unifying TimedTextDriver\u0027s resume() and start().\n" }, { "commit": "3a1eb965f72732936042d91f158c548e1f1f4411", "tree": "e31e6bab703648c2b660e374532c75ea61e2b194", "parents": [ "59fdb1c90ce173c14af6a8d87657af91a5a4386e", "249ab5171fe04a1fa264dad056dcc47ddddbc957" ], "author": { "name": "Insun Kang", "email": "insun@google.com", "time": "Thu Aug 02 15:08:16 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 15:08:16 2012 -0700" }, "message": "am 249ab517: am 6472badc: Fix: status checking in TimedTextDriver.\n\n* commit \u0027249ab5171fe04a1fa264dad056dcc47ddddbc957\u0027:\n Fix: status checking in TimedTextDriver.\n" }, { "commit": "59fdb1c90ce173c14af6a8d87657af91a5a4386e", "tree": "30ec03da359c36506f2ac7853c5b39f110dfaaa3", "parents": [ "c55ad97939859933947282cf870ef16de249329e", "dd43ebd391519d73a94f7d21a0a2e58dda2e2d20" ], "author": { "name": "Insun Kang", "email": "insun@google.com", "time": "Thu Aug 02 15:08:15 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 15:08:15 2012 -0700" }, "message": "am dd43ebd3: am bb6bc849: Adds resume() function\n\n* commit \u0027dd43ebd391519d73a94f7d21a0a2e58dda2e2d20\u0027:\n Adds resume() function\n" }, { "commit": "c55ad97939859933947282cf870ef16de249329e", "tree": "a1a05750dac7b396e218c0f400ad3969772ee9d6", "parents": [ "ba15bb81e383d11f06ffd85a5674658b7e18c8af", "141e0810935c24766282b48116eec2657b30b25b" ], "author": { "name": "Insun Kang", "email": "insun@google.com", "time": "Thu Aug 02 15:08:14 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 15:08:14 2012 -0700" }, "message": "am 141e0810: am 2f0632f1: Adjust fire time of a timed text message before firing it.\n\n* commit \u0027141e0810935c24766282b48116eec2657b30b25b\u0027:\n Adjust fire time of a timed text message before firing it.\n" }, { "commit": "ba15bb81e383d11f06ffd85a5674658b7e18c8af", "tree": "292e80eb8ca1accf9c62bac46e61dbac57075723", "parents": [ "22651d2b681f3f75e2a1e73daede1b94e998cc6f", "58defc8e21031444f69558a9f5e632f81fbdba70" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 15:08:12 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 15:08:12 2012 -0700" }, "message": "am 58defc8e: am 9007619d: Merge \"Shutter sound is heard at the end of the recorded video\" into jb-mr1-dev\n\n* commit \u002758defc8e21031444f69558a9f5e632f81fbdba70\u0027:\n Shutter sound is heard at the end of the recorded video\n" }, { "commit": "22651d2b681f3f75e2a1e73daede1b94e998cc6f", "tree": "292e80eb8ca1accf9c62bac46e61dbac57075723", "parents": [ "bdce245042dab808cb9062d9161256f01b03a79c", "174e8f67cf909ca293d45face46bd0a65199e211" ], "author": { "name": "Patric Frederiksen", "email": "patric.frederiksen@sonymobile.com", "time": "Thu Aug 02 15:08:11 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 15:08:11 2012 -0700" }, "message": "am 174e8f67: Shutter sound is heard at the end of the recorded video\n\n* commit \u0027174e8f67cf909ca293d45face46bd0a65199e211\u0027:\n Shutter sound is heard at the end of the recorded video\n" }, { "commit": "c249e7b7f0b79879670ba70c24c2e9364a1e1720", "tree": "84529f95eacfe525e3ecbc0d9a6f4b49fb0c737b", "parents": [ "dfc7371e43960a36018a1df41a1c7f1737480430", "ac9b96003da5dad9ae6fc8d054d7b24ef24693fe" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Aug 02 14:57:03 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 14:57:03 2012 -0700" }, "message": "am ac9b9600: Merge \"Allocate buffers before calling start on its source in OMXCodec::start() for encoder case\" into jb-mr1-dev\n\n* commit \u0027ac9b96003da5dad9ae6fc8d054d7b24ef24693fe\u0027:\n Allocate buffers before calling start on its source in OMXCodec::start() for encoder case\n" }, { "commit": "dfc7371e43960a36018a1df41a1c7f1737480430", "tree": "7e080db5914465b3f739f68ae9a21cef94646c9f", "parents": [ "f6f6cfc17f89350f37cee1549533778ade226437", "9cb20d4a41eb84bfab7f9f0d0829393f378583f4" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 14:57:02 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 14:57:02 2012 -0700" }, "message": "am 9cb20d4a: am a9ab66c5: (-s ours) am ffd99cb7: Merge \"Shutter sound is heard at the end of the recorded video\"\n\n* commit \u00279cb20d4a41eb84bfab7f9f0d0829393f378583f4\u0027:\n Shutter sound is heard at the end of the recorded video\n" }, { "commit": "ac9b96003da5dad9ae6fc8d054d7b24ef24693fe", "tree": "84529f95eacfe525e3ecbc0d9a6f4b49fb0c737b", "parents": [ "9cb20d4a41eb84bfab7f9f0d0829393f378583f4", "0dff606f42292b8a31b9eee842877f9875279dab" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Aug 02 14:43:51 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 02 14:43:51 2012 -0700" }, "message": "Merge \"Allocate buffers before calling start on its source in OMXCodec::start() for encoder case\" into jb-mr1-dev" }, { "commit": "0dff606f42292b8a31b9eee842877f9875279dab", "tree": "84529f95eacfe525e3ecbc0d9a6f4b49fb0c737b", "parents": [ "c9729ca1cb1760da836e293e3ed7a82f769f3e07" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Aug 01 19:32:46 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Aug 02 14:01:25 2012 -0700" }, "message": "Allocate buffers before calling start on its source in OMXCodec::start() for encoder case\n\no This makes it possible to configure the source to use the same number of input buffers\n as requested by the video encoder, before the source starts. As a result, hardcoded\n number of video buffers for camera source, for instance, can be avoided.\n\no related-to-bug: 6920805\n\nChange-Id: I13d2c308dce34967768cd407f02988e92ef10a89\n" }, { "commit": "9cb20d4a41eb84bfab7f9f0d0829393f378583f4", "tree": "7e080db5914465b3f739f68ae9a21cef94646c9f", "parents": [ "c9729ca1cb1760da836e293e3ed7a82f769f3e07", "a9ab66c5fac826a765186146128158672bfac67c" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 02 12:24:46 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 02 12:24:46 2012 -0700" }, "message": "am a9ab66c5: (-s ours) am ffd99cb7: Merge \"Shutter sound is heard at the end of the recorded video\"\n\n* commit \u0027a9ab66c5fac826a765186146128158672bfac67c\u0027:\n Shutter sound is heard at the end of the recorded video\n" }, { "commit": "f6f6cfc17f89350f37cee1549533778ade226437", "tree": "7e080db5914465b3f739f68ae9a21cef94646c9f", "parents": [ "cc788456c867f8e97e40b0cb8dab58ce9db4a27b", "cda97f7435e685a2d717c40db03ece6c709578f1" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Aug 02 11:26:32 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Aug 02 11:26:32 2012 -0700" }, "message": "Reconcile with jb-mr1-release - do not merge\n\nChange-Id: I6214770f9936bcdde41fdb10e61e79da1ef675ed\n" }, { "commit": "cda97f7435e685a2d717c40db03ece6c709578f1", "tree": "7e080db5914465b3f739f68ae9a21cef94646c9f", "parents": [ "c9729ca1cb1760da836e293e3ed7a82f769f3e07", "ba352c87633138aae401f4cd142372097e700b0f" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Aug 02 07:16:33 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Aug 02 07:16:33 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "cc788456c867f8e97e40b0cb8dab58ce9db4a27b", "tree": "7e080db5914465b3f739f68ae9a21cef94646c9f", "parents": [ "249ab5171fe04a1fa264dad056dcc47ddddbc957", "c9729ca1cb1760da836e293e3ed7a82f769f3e07" ], "author": { "name": "Insun Kang", "email": "insun@google.com", "time": "Wed Aug 01 23:22:25 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 01 23:22:25 2012 -0700" }, "message": "am c9729ca1: Unifying TimedTextDriver\\\u0027s resume() and start().\n\n* commit \u0027c9729ca1cb1760da836e293e3ed7a82f769f3e07\u0027:\n Unifying TimedTextDriver\u0027s resume() and start().\n" }, { "commit": "249ab5171fe04a1fa264dad056dcc47ddddbc957", "tree": "682bc926abcc04dff0783b1fa4ecb379d2908cb5", "parents": [ "dd43ebd391519d73a94f7d21a0a2e58dda2e2d20", "6472badc497a9e748411f8c8c9ed5d83ef335a85" ], "author": { "name": "Insun Kang", "email": "insun@google.com", "time": "Wed Aug 01 23:20:32 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 01 23:20:32 2012 -0700" }, "message": "am 6472badc: Fix: status checking in TimedTextDriver.\n\n* commit \u00276472badc497a9e748411f8c8c9ed5d83ef335a85\u0027:\n Fix: status checking in TimedTextDriver.\n" }, { "commit": "dd43ebd391519d73a94f7d21a0a2e58dda2e2d20", "tree": "276e8c9aac3e7838ed61cdbda857ae27947975e9", "parents": [ "141e0810935c24766282b48116eec2657b30b25b", "bb6bc8491fe819f96e1902e56694715cb110ce94" ], "author": { "name": "Insun Kang", "email": "insun@google.com", "time": "Wed Aug 01 23:20:30 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 01 23:20:30 2012 -0700" }, "message": "am bb6bc849: Adds resume() function\n\n* commit \u0027bb6bc8491fe819f96e1902e56694715cb110ce94\u0027:\n Adds resume() function\n" }, { "commit": "141e0810935c24766282b48116eec2657b30b25b", "tree": "e1cfdbfb3834e49e165cea7f80a10f0f612c384b", "parents": [ "58defc8e21031444f69558a9f5e632f81fbdba70", "2f0632f12cd02b0350918720443c888b48f4417b" ], "author": { "name": "Insun Kang", "email": "insun@google.com", "time": "Wed Aug 01 23:17:41 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 01 23:17:41 2012 -0700" }, "message": "am 2f0632f1: Adjust fire time of a timed text message before firing it.\n\n* commit \u00272f0632f12cd02b0350918720443c888b48f4417b\u0027:\n Adjust fire time of a timed text message before firing it.\n" }, { "commit": "58defc8e21031444f69558a9f5e632f81fbdba70", "tree": "dd3f273e129ea9864e87d4df79eb78dab157744e", "parents": [ "174e8f67cf909ca293d45face46bd0a65199e211", "9007619d1f786a75dae0fff31feadbf9aed9cfb8" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Aug 01 23:17:41 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 01 23:17:41 2012 -0700" }, "message": "am 9007619d: Merge \"Shutter sound is heard at the end of the recorded video\" into jb-mr1-dev\n\n* commit \u00279007619d1f786a75dae0fff31feadbf9aed9cfb8\u0027:\n Shutter sound is heard at the end of the recorded video\n" }, { "commit": "c9729ca1cb1760da836e293e3ed7a82f769f3e07", "tree": "7e080db5914465b3f739f68ae9a21cef94646c9f", "parents": [ "6472badc497a9e748411f8c8c9ed5d83ef335a85" ], "author": { "name": "Insun Kang", "email": "insun@google.com", "time": "Tue Jul 24 14:44:06 2012 +0900" }, "committer": { "name": "Insun Kang", "email": "insun@google.com", "time": "Thu Aug 02 11:56:07 2012 +0900" }, "message": "Unifying TimedTextDriver\u0027s resume() and start().\n\n(cherry picked from gtv bb23a2b7e06c59f56e353fd4a2a66a9b8179d425)\n\nChange-Id: If5f14549fa315c34e32d6fed7c1ea09deabceb63\n" }, { "commit": "6472badc497a9e748411f8c8c9ed5d83ef335a85", "tree": "682bc926abcc04dff0783b1fa4ecb379d2908cb5", "parents": [ "bb6bc8491fe819f96e1902e56694715cb110ce94" ], "author": { "name": "Insun Kang", "email": "insun@google.com", "time": "Mon Jun 18 16:51:48 2012 +0900" }, "committer": { "name": "Insun Kang", "email": "insun@google.com", "time": "Thu Aug 02 11:56:07 2012 +0900" }, "message": "Fix: status checking in TimedTextDriver.\n\no fixes seeking error when there\u0027s no enabled text track.\no clean up status checking code for deselectTrack.\no fixes a potential bug : pause-\u003ebackward seek can trigger unwanted\nresume.\n\nBug: 6682160\nChange-Id: I03d8788b27fb9c0a6092be83ad3578ccf3266905\n(cherry picked from commit 2dafb6071d4f14e0e208912500694912211aa26b)\n" }, { "commit": "bb6bc8491fe819f96e1902e56694715cb110ce94", "tree": "276e8c9aac3e7838ed61cdbda857ae27947975e9", "parents": [ "2f0632f12cd02b0350918720443c888b48f4417b" ], "author": { "name": "Insun Kang", "email": "insun@google.com", "time": "Tue Jul 10 15:53:44 2012 +0900" }, "committer": { "name": "Insun Kang", "email": "insun@google.com", "time": "Thu Aug 02 11:56:07 2012 +0900" }, "message": "Adds resume() function\n\no Revived resume() function to fix pause/resume bug. (Bug: 6663740)\no Mannually cherry-picked from GTV change.\n(commit: ad1197226d1c6745959f0e469f510ca06f99489f)\n\nChange-Id: I77ac90085fb1f1d2e7eb706642978a4fa4d28b49\n" }, { "commit": "2f0632f12cd02b0350918720443c888b48f4417b", "tree": "e1cfdbfb3834e49e165cea7f80a10f0f612c384b", "parents": [ "9007619d1f786a75dae0fff31feadbf9aed9cfb8" ], "author": { "name": "Insun Kang", "email": "insun@google.com", "time": "Fri Jun 01 16:21:11 2012 +0900" }, "committer": { "name": "Insun Kang", "email": "insun@google.com", "time": "Thu Aug 02 11:56:07 2012 +0900" }, "message": "Adjust fire time of a timed text message before firing it.\n\nrelated-to-bug: 6501328\n\no When Video/Audio is stuttering, subtitle\u0027s firing time should be\nadjusted.\n\nChange-Id: I0e7e8a1796cb2b3c8a09c8fbd41690bce2689e85\n(cherry picked from gtv: commit b2c3aedcb6c145e33ded39ef81e3202b2419469f)\n" }, { "commit": "a9ab66c5fac826a765186146128158672bfac67c", "tree": "9c0e95c208aba7e95023f407e6bcfe6084d14312", "parents": [ "b3192c5abf7321cb3437a3aedacd632311634bff", "ffd99cb795c92caee7f4bd0b26af9ae37b100fc3" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Aug 01 17:22:34 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 01 17:22:34 2012 -0700" }, "message": "am ffd99cb7: Merge \"Shutter sound is heard at the end of the recorded video\"\n\n* commit \u0027ffd99cb795c92caee7f4bd0b26af9ae37b100fc3\u0027:\n Shutter sound is heard at the end of the recorded video\n" }, { "commit": "174e8f67cf909ca293d45face46bd0a65199e211", "tree": "dd3f273e129ea9864e87d4df79eb78dab157744e", "parents": [ "b2676a2920c6514ae9405cc56dfa2db49f096016" ], "author": { "name": "Patric Frederiksen", "email": "patric.frederiksen@sonymobile.com", "time": "Tue Jul 10 13:38:35 2012 +0200" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 01 16:25:51 2012 -0700" }, "message": "Shutter sound is heard at the end of the recorded video\n\nOn fast hardware, which is more common, the shutter sound is\nplayed and recorded before video recording is stopped.\n\nBefore we call play shutter sound before calling stop recording.\nWith this fix we call play shutter sound after calling stop recording.\n\nChange-Id: I06a3e65fd2700f1d2457fea5ff0f64500eac436f\n" }, { "commit": "9007619d1f786a75dae0fff31feadbf9aed9cfb8", "tree": "dd3f273e129ea9864e87d4df79eb78dab157744e", "parents": [ "44cda3a4e7ca3de0db9cb49145def3803b03ebb4", "35f859b338c0922094ecfc37fb8157530df6b305" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Aug 01 16:15:35 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 01 16:15:36 2012 -0700" }, "message": "Merge \"Shutter sound is heard at the end of the recorded video\" into jb-mr1-dev" }, { "commit": "ffd99cb795c92caee7f4bd0b26af9ae37b100fc3", "tree": "8052661f7b84736d863a553b4c3e0037729363e9", "parents": [ "ffb829430ff20ccd6c13e6ed894f2373b2d93939", "a21795c5d1d4ca9a6361e4b2db3e1f053e67b1c9" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Aug 01 16:13:50 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Aug 01 16:13:50 2012 -0700" }, "message": "Merge \"Shutter sound is heard at the end of the recorded video\"" }, { "commit": "35f859b338c0922094ecfc37fb8157530df6b305", "tree": "62fc06cc2c07cd7e7a559f0f3b744ce30a24fdd1", "parents": [ "25f0d7ba1987de61c75f8c68b19de48e0ad9736c" ], "author": { "name": "Patric Frederiksen", "email": "patric.frederiksen@sonymobile.com", "time": "Tue Jul 10 13:38:35 2012 +0200" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Aug 01 15:54:55 2012 -0700" }, "message": "Shutter sound is heard at the end of the recorded video\n\nOn fast hardware, which is more common, the shutter sound is\nplayed and recorded before video recording is stopped.\n\nBefore we call play shutter sound before calling stop recording.\nWith this fix we call play shutter sound after calling stop recording.\n\nChange-Id: I06a3e65fd2700f1d2457fea5ff0f64500eac436f\n" } ], "next": "bdce245042dab808cb9062d9161256f01b03a79c" }