)]}' { "log": [ { "commit": "2fd1f152d3e824cd614770e95a5f3ccd4f8f0f2a", "tree": "62d7ea006812aeb5dad940033b3c2a7c637a74cc", "parents": [ "2b377522da2264879305a2073d2eef0a7f908873", "900fecc9d66bda71f428a4d3cebc1fee14916301" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Mar 25 20:19:37 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 25 20:19:37 2013 +0000" }, "message": "am 351f28e2: Merge \"Load crypto plugins from additional shared libraries\" into jb-mr2-dev\n\n* commit \u0027351f28e2e71bef7fab42ec36150b7973fd4ef139\u0027:\n Load crypto plugins from additional shared libraries\n" }, { "commit": "900fecc9d66bda71f428a4d3cebc1fee14916301", "tree": "62d7ea006812aeb5dad940033b3c2a7c637a74cc", "parents": [ "cbb2aad7a8aced67d2d97e03d8cd78b1a843290c", "5beac28a34e557251bd4bbd77a6d9303a69d4319" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Mon Mar 25 20:18:02 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Mar 25 20:18:02 2013 +0000" }, "message": "Merge \"Load crypto plugins from additional shared libraries\" into jb-mr2-dev" }, { "commit": "2b377522da2264879305a2073d2eef0a7f908873", "tree": "7d47bab47cc5bf6cb0b12baad8e36ec32856621d", "parents": [ "643c60094709d0569c44f5810c1895ed70b92cc9", "cbb2aad7a8aced67d2d97e03d8cd78b1a843290c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Mar 25 17:38:50 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 25 17:38:50 2013 +0000" }, "message": "am 09bfd026: Merge \"Separate the mode of the RTP and RTCP channels.\" into jb-mr2-dev\n\n* commit \u002709bfd026b9f4fe004cba05e2eaf2dee38913bc7e\u0027:\n Separate the mode of the RTP and RTCP channels.\n" }, { "commit": "cbb2aad7a8aced67d2d97e03d8cd78b1a843290c", "tree": "7d47bab47cc5bf6cb0b12baad8e36ec32856621d", "parents": [ "10222ef1c1728e0d623954eec4b9732d39e9e9ec", "a64ea768de9c02bce0e545be032dabe8b6c39727" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Mar 25 17:37:25 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Mar 25 17:37:25 2013 +0000" }, "message": "Merge \"Separate the mode of the RTP and RTCP channels.\" into jb-mr2-dev" }, { "commit": "a64ea768de9c02bce0e545be032dabe8b6c39727", "tree": "5f915fef2c62d376c13669aac409ce22c7a8d0a8", "parents": [ "2247dd0dc60096d1b5a91ccadb5539f0b100c88f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Mar 22 09:56:29 2013 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Mar 25 10:36:33 2013 -0700" }, "message": "Separate the mode of the RTP and RTCP channels.\n\nI now can use a TCP reliable data channel with a UDP back channel.\n\nChange-Id: Ieb0f0970e3a6da4cff250e9547e181c0c961b9fb\n" }, { "commit": "643c60094709d0569c44f5810c1895ed70b92cc9", "tree": "8a3c6245cbbaff08bd6733841cd16fbca53085eb", "parents": [ "223d28b023d6e30c692d52d6eb1209626a705633", "10222ef1c1728e0d623954eec4b9732d39e9e9ec" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Mar 25 17:25:52 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 25 17:25:52 2013 +0000" }, "message": "am 2850e418: Merge \"Ensure that the payload in each TS packet is an even multiple of 16 bytes long\" into jb-mr2-dev\n\n* commit \u00272850e41813c2bfaf199fefc990d7ec91551a9460\u0027:\n Ensure that the payload in each TS packet is an even multiple of 16 bytes long\n" }, { "commit": "10222ef1c1728e0d623954eec4b9732d39e9e9ec", "tree": "8a3c6245cbbaff08bd6733841cd16fbca53085eb", "parents": [ "2247dd0dc60096d1b5a91ccadb5539f0b100c88f", "e8ad89f993bb36f9c869f3a71bbcd60949979e1a" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Mar 25 17:24:23 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Mar 25 17:24:23 2013 +0000" }, "message": "Merge \"Ensure that the payload in each TS packet is an even multiple of 16 bytes long\" into jb-mr2-dev" }, { "commit": "5beac28a34e557251bd4bbd77a6d9303a69d4319", "tree": "bddefa894193bdb535c5f0090e7edab2e3d9eca4", "parents": [ "3a29ea87c8fdcd45987bcc9cd2b68961ac971d27" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Mar 22 15:26:39 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Mar 22 15:26:39 2013 -0700" }, "message": "Load crypto plugins from additional shared libraries\n\nCurrently crypto plugins are expected to be in libdrmdecrypt.so.\nWhen there are multiple plugins supporting different schemes,\nthis approach requires source code integration across\nvendors which is unmanagable. Also, for integration with\nMediaDrm where the crypto keys are obtained from a drm server,\nthe MediaCrypto plugin needs to interoperate with the MediaDrm\nplugin. This change allows {MediaCrypto, MediaDrm} pairs that\nare logically related to be implemented in a common shared\nlibrary.\n\nChange-Id: I7f6638f29171f91609fc2d944396365568630b56\n" }, { "commit": "223d28b023d6e30c692d52d6eb1209626a705633", "tree": "88a6d3b2e506d786f3d0e2310dc777f03e8d6a2f", "parents": [ "1d5c4f4a461e2f2bb5db538b4182fbffcfcfae1a", "2247dd0dc60096d1b5a91ccadb5539f0b100c88f" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Mar 22 00:47:59 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 22 00:47:59 2013 +0000" }, "message": "am a97d15e2: Merge \"ICameraServiceListener.h: Add STATUS_ENUMERATING enum\" into jb-mr2-dev\n\n* commit \u0027a97d15e2e2f0b317a345d3a6f02df80b8988b1f6\u0027:\n ICameraServiceListener.h: Add STATUS_ENUMERATING enum\n" }, { "commit": "2247dd0dc60096d1b5a91ccadb5539f0b100c88f", "tree": "88a6d3b2e506d786f3d0e2310dc777f03e8d6a2f", "parents": [ "f760a1b26a907f4f5b133dde66880bb666540c42", "b1a142ce32feb4668c504c0860a7350d000fe7fa" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Mar 22 00:45:55 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 22 00:45:55 2013 +0000" }, "message": "Merge \"ICameraServiceListener.h: Add STATUS_ENUMERATING enum\" into jb-mr2-dev" }, { "commit": "b1a142ce32feb4668c504c0860a7350d000fe7fa", "tree": "581048abf39b30f2e231c341a95d41d347c995bb", "parents": [ "42404e895c182df761cbd2473d172e58e763ac89" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 18 13:36:48 2013 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Mar 21 17:28:01 2013 -0700" }, "message": "ICameraServiceListener.h: Add STATUS_ENUMERATING enum\n\nChange-Id: I41a9f358f63a19e7b746a9ccf24722001e5e7475\n" }, { "commit": "1d5c4f4a461e2f2bb5db538b4182fbffcfcfae1a", "tree": "84ee69166607205bca10bde1eee891b2c4e7fd28", "parents": [ "6bf4f248603359718c462cfde84d6e490b4f6ec9", "f760a1b26a907f4f5b133dde66880bb666540c42" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Mar 21 21:03:01 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 21 21:03:01 2013 +0000" }, "message": "am 3f9cc191: Merge changes Ic92924ce,I53107a39 into jb-mr2-dev\n\n* commit \u00273f9cc191867e79fccb4b8cca7e2a38e1b2c225b1\u0027:\n Camera2: getSceneMode should return NULL when there are no supported scene modes\n commandStartFaceDetectionL returned the wrong value when face detection is not supported by the HAL. This caused the JNI function to fail since it expected a BAD_VALUE response in that case.\n" }, { "commit": "f760a1b26a907f4f5b133dde66880bb666540c42", "tree": "84ee69166607205bca10bde1eee891b2c4e7fd28", "parents": [ "3a29ea87c8fdcd45987bcc9cd2b68961ac971d27", "b08a63931f22a1e934b32e8fb8de9ab4877d5258" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Mar 21 20:58:29 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Mar 21 20:58:30 2013 +0000" }, "message": "Merge changes Ic92924ce,I53107a39 into jb-mr2-dev\n\n* changes:\n Camera2: getSceneMode should return NULL when there are no supported scene modes\n commandStartFaceDetectionL returned the wrong value when face detection is not supported by the HAL. This caused the JNI function to fail since it expected a BAD_VALUE response in that case.\n" }, { "commit": "e8ad89f993bb36f9c869f3a71bbcd60949979e1a", "tree": "99ecc7002b88c6b9a2eb8c09e9799dfae5d14ef0", "parents": [ "aab193b107e302e145b5c3d6e6c87f92ac296186" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Mar 21 11:35:48 2013 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Mar 21 11:35:48 2013 -0700" }, "message": "Ensure that the payload in each TS packet is an even multiple of 16 bytes long\n\n(except for the final TS packet) as specified by HDCP.\n\nChange-Id: I45d49d347c06f5daae310f196d9a8484be0f3ca0\nrelated-to-bug: 7549145\n" }, { "commit": "b08a63931f22a1e934b32e8fb8de9ab4877d5258", "tree": "33df1aa21ac9d458278805b64936a65057866e25", "parents": [ "ea49f4b4ba9d182fd8a74c74d16590cb65f3a5f1" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Mar 21 11:19:00 2013 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Mar 21 11:32:17 2013 -0700" }, "message": "Camera2: getSceneMode should return NULL when there are no supported scene modes\n\nBug: 8444806\nChange-Id: Ic92924ceda3de738a7971605552baf00a4fc0546\n" }, { "commit": "ea49f4b4ba9d182fd8a74c74d16590cb65f3a5f1", "tree": "7eb4fd1e14856d1d1f6600cc350218688c712b64", "parents": [ "42404e895c182df761cbd2473d172e58e763ac89" ], "author": { "name": "Ziv Hendel", "email": "ziv@primesense.com", "time": "Thu Mar 21 03:25:32 2013 +0200" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Mar 21 11:32:06 2013 -0700" }, "message": "commandStartFaceDetectionL returned the wrong value when face detection is not supported by the HAL.\nThis caused the JNI function to fail since it expected a BAD_VALUE response in that case.\n\nChange-Id: I53107a3958d541c25930b81eda638d4b6a394254\nSigned-off-by: Igor Murashkin \u003ciam@google.com\u003e\n" }, { "commit": "6bf4f248603359718c462cfde84d6e490b4f6ec9", "tree": "799496b667decd5c7cffeef3e56e3865b393f357", "parents": [ "5b66d1e144f91a14c1631fd066fd59750c0930f2", "3a29ea87c8fdcd45987bcc9cd2b68961ac971d27" ], "author": { "name": "ztenghui", "email": "ztenghui@google.com", "time": "Wed Mar 20 17:03:32 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 20 17:03:32 2013 +0000" }, "message": "am 9e36b5a5: Merge \"Add the presentation rotation support\" into jb-mr2-dev\n\n* commit \u00279e36b5a5c630c303b5007fdeb5c0df83b953adf4\u0027:\n Add the presentation rotation support\n" }, { "commit": "3a29ea87c8fdcd45987bcc9cd2b68961ac971d27", "tree": "799496b667decd5c7cffeef3e56e3865b393f357", "parents": [ "aab193b107e302e145b5c3d6e6c87f92ac296186", "11287471298193ff51ffb429686f5d63a84a621b" ], "author": { "name": "ztenghui", "email": "ztenghui@google.com", "time": "Wed Mar 20 17:00:50 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 20 17:00:50 2013 +0000" }, "message": "Merge \"Add the presentation rotation support\" into jb-mr2-dev" }, { "commit": "5b66d1e144f91a14c1631fd066fd59750c0930f2", "tree": "0150308f9b4bf86e2ea73a23da6720f5fd989c3c", "parents": [ "34eadebe6ee2126d26a24c544305c65e13167831", "aab193b107e302e145b5c3d6e6c87f92ac296186" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Mar 20 16:53:15 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 20 16:53:15 2013 +0000" }, "message": "am de5cdcae: Merge \"Implementing MediaDrm APIs\" into jb-mr2-dev\n\n* commit \u0027de5cdcae51d3afd9b14e818087be14288c0c6b8c\u0027:\n Implementing MediaDrm APIs\n" }, { "commit": "aab193b107e302e145b5c3d6e6c87f92ac296186", "tree": "0150308f9b4bf86e2ea73a23da6720f5fd989c3c", "parents": [ "42404e895c182df761cbd2473d172e58e763ac89", "cc82dc6d500023eba6048616301a4b12682458db" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Mar 20 16:48:54 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 20 16:48:55 2013 +0000" }, "message": "Merge \"Implementing MediaDrm APIs\" into jb-mr2-dev" }, { "commit": "34eadebe6ee2126d26a24c544305c65e13167831", "tree": "0f03a2c0e166bac89ab829035490e9c6de08d534", "parents": [ "fe32f2ff16006d0ca461076f4e809a7dfc5563a1", "42b056dc3eaf4b07445ea207b1b5ab15fa5918bb" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Mar 20 09:32:32 2013 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Mar 20 09:32:32 2013 -0700" }, "message": "Reconcile with jb-mr2-release - do not merge\n\nChange-Id: I4e399f8f0b110b7b46c6cf6a65fdc908acb4f9ce\n" }, { "commit": "42b056dc3eaf4b07445ea207b1b5ab15fa5918bb", "tree": "0f03a2c0e166bac89ab829035490e9c6de08d534", "parents": [ "42404e895c182df761cbd2473d172e58e763ac89", "0417a1e88f72eef4723fa8b05f871951a48641c9" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Mar 20 05:55:41 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Mar 20 05:55:41 2013 -0700" }, "message": "merge in jb-mr2-release history after reset to jb-mr2-dev\n" }, { "commit": "fe32f2ff16006d0ca461076f4e809a7dfc5563a1", "tree": "0f03a2c0e166bac89ab829035490e9c6de08d534", "parents": [ "6969cb950042358df66117fd1255d52212f7864b", "42404e895c182df761cbd2473d172e58e763ac89" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Mar 19 21:33:18 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 19 21:33:18 2013 +0000" }, "message": "am 96954c00: Merge \"Change ANetworkSession implementation to optionally attach timestamps\" into jb-mr2-dev\n\n* commit \u002796954c00cc8887f216ba84e126ab4a1100f348b4\u0027:\n Change ANetworkSession implementation to optionally attach timestamps\n" }, { "commit": "6969cb950042358df66117fd1255d52212f7864b", "tree": "d887257fd94b5f15f8287faf1263cef56dbaf270", "parents": [ "16de5d57778302b39501feec133f5f893e2b5920", "ffe25bc8dc76fe437afeaafe679943b33a468986" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Mar 19 21:33:17 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 19 21:33:17 2013 +0000" }, "message": "am 106f1628: Merge \"Allow for streaming of media files (without recompression)\" into jb-mr2-dev\n\n* commit \u0027106f1628b849f733046f1da25e4c8222676288b0\u0027:\n Allow for streaming of media files (without recompression)\n" }, { "commit": "42404e895c182df761cbd2473d172e58e763ac89", "tree": "0f03a2c0e166bac89ab829035490e9c6de08d534", "parents": [ "ffe25bc8dc76fe437afeaafe679943b33a468986", "632177b7446185a0407b7df96f684a9b8b980765" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Mar 19 21:29:51 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Mar 19 21:29:52 2013 +0000" }, "message": "Merge \"Change ANetworkSession implementation to optionally attach timestamps\" into jb-mr2-dev" }, { "commit": "ffe25bc8dc76fe437afeaafe679943b33a468986", "tree": "d887257fd94b5f15f8287faf1263cef56dbaf270", "parents": [ "c235df864edded100bc50c4352fd6672f16353b1", "16fb8f3954a6a4058953c505a4e7958a1b14c62b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Mar 19 21:29:39 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Mar 19 21:29:39 2013 +0000" }, "message": "Merge \"Allow for streaming of media files (without recompression)\" into jb-mr2-dev" }, { "commit": "16de5d57778302b39501feec133f5f893e2b5920", "tree": "295569c07edf824f6c75c90ced6d71875f1c4e1e", "parents": [ "cb7e490c996a9d018a4ead4b87e7339b1af47855", "c235df864edded100bc50c4352fd6672f16353b1" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Mar 19 17:26:34 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 19 17:26:34 2013 +0000" }, "message": "am b8a1a843: Merge \"Fix valgrind error\" into jb-mr2-dev\n\n* commit \u0027b8a1a843fef294efb59ca404e7b55994036a15e2\u0027:\n Fix valgrind error\n" }, { "commit": "c235df864edded100bc50c4352fd6672f16353b1", "tree": "295569c07edf824f6c75c90ced6d71875f1c4e1e", "parents": [ "307c058cbded02a9c36eff40787c86473c2617ec", "6a5c6ed13e3ea1b19835e08624125c9b1505b32c" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Mar 19 17:24:04 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Mar 19 17:24:04 2013 +0000" }, "message": "Merge \"Fix valgrind error\" into jb-mr2-dev" }, { "commit": "6a5c6ed13e3ea1b19835e08624125c9b1505b32c", "tree": "f3a83e08b9a6c526ee1b3cbfe02de1ed09382770", "parents": [ "4f4c2655dc3f6fcef766db6e793b1642ad0fd605" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Mar 19 09:57:29 2013 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Mar 19 09:57:29 2013 -0700" }, "message": "Fix valgrind error\n\nThe volume member of the BundledEffectContext class was not being\ninitialized, resulting in uninitialized data being used for calculations\nand control flow.\n\nChange-Id: I84bf9fd478e5d0479e781323b21c7c03dea958c5\n" }, { "commit": "0417a1e88f72eef4723fa8b05f871951a48641c9", "tree": "1170dcf4e4038277301df1e7aabcdfdf5577b96e", "parents": [ "307c058cbded02a9c36eff40787c86473c2617ec", "6fd370ba19386b7c97ce5ccde60f584efd2d5c9e" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Mar 19 05:55:20 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Mar 19 05:55:20 2013 -0700" }, "message": "merge in jb-mr2-release history after reset to jb-mr2-dev\n" }, { "commit": "632177b7446185a0407b7df96f684a9b8b980765", "tree": "112512d2be5f989019edc4055214b93239a54505", "parents": [ "16fb8f3954a6a4058953c505a4e7958a1b14c62b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Mar 18 15:11:40 2013 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Mar 18 15:12:55 2013 -0700" }, "message": "Change ANetworkSession implementation to optionally attach timestamps\n\nto fragments of data to be transferred and to log statistics when data\nis finally submitted to the POSIX layer.\n\nChange-Id: Icbfcac203cdc5c9eac1634e84d34bb380b316a01\n" }, { "commit": "cb7e490c996a9d018a4ead4b87e7339b1af47855", "tree": "1170dcf4e4038277301df1e7aabcdfdf5577b96e", "parents": [ "03b7d62170ea5ee595521f89b11a03850d31c886", "307c058cbded02a9c36eff40787c86473c2617ec" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Mon Mar 18 19:55:28 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 18 19:55:28 2013 +0000" }, "message": "am 769728f1: Merge \"Camera: fix waitUntilDrained log message\" into jb-mr2-dev\n\n* commit \u0027769728f1ccfb328747c02a534c3a950eb7b026cb\u0027:\n Camera: fix waitUntilDrained log message\n" }, { "commit": "307c058cbded02a9c36eff40787c86473c2617ec", "tree": "1170dcf4e4038277301df1e7aabcdfdf5577b96e", "parents": [ "e483d98763cefa19520a97c50ae4777041646974", "f0eeb53e4763fe5063d3ce880f72d52f136fc3c5" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Mon Mar 18 19:52:43 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Mar 18 19:52:43 2013 +0000" }, "message": "Merge \"Camera: fix waitUntilDrained log message\" into jb-mr2-dev" }, { "commit": "03b7d62170ea5ee595521f89b11a03850d31c886", "tree": "d6257466c4a2c7c7648216d099c13c0b8fb6197f", "parents": [ "be69fcbe131881b776dac0d938611b5e60aa9650", "e483d98763cefa19520a97c50ae4777041646974" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 18 18:41:43 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 18 18:41:43 2013 +0000" }, "message": "am edb86fe5: Merge \"ProCameraTests: Minor add grey/frame count debug-only print outs\" into jb-mr2-dev\n\n* commit \u0027edb86fe540cf45668909daa5b529f63804562105\u0027:\n ProCameraTests: Minor add grey/frame count debug-only print outs\n" }, { "commit": "e483d98763cefa19520a97c50ae4777041646974", "tree": "d6257466c4a2c7c7648216d099c13c0b8fb6197f", "parents": [ "4f4c2655dc3f6fcef766db6e793b1642ad0fd605", "46ee76c093796924de4e0d356220844a99d10707" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 18 18:38:10 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Mar 18 18:38:10 2013 +0000" }, "message": "Merge \"ProCameraTests: Minor add grey/frame count debug-only print outs\" into jb-mr2-dev" }, { "commit": "46ee76c093796924de4e0d356220844a99d10707", "tree": "cbd1ba69b133eda39601a1c8486eb15756b533db", "parents": [ "26bb1d3702e01779c5ef481c2ad38568d4cc2aa8" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 18 11:10:48 2013 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 18 11:10:48 2013 -0700" }, "message": "ProCameraTests: Minor add grey/frame count debug-only print outs\n\nChange-Id: I0f7b7f3c083a644e9bb0c2302244a5ad434e96a8\n" }, { "commit": "16fb8f3954a6a4058953c505a4e7958a1b14c62b", "tree": "60744602ca2f690db35d1bc6f0ab97409f073b3b", "parents": [ "b7be24f055426f00fd1ae1af07d5dd40dbcedfe7" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Mar 18 11:09:22 2013 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Mar 18 11:09:22 2013 -0700" }, "message": "Allow for streaming of media files (without recompression)\n\nChange-Id: I1de356cc37506ba986822d12a1a59e7b64069e02\n" }, { "commit": "6fd370ba19386b7c97ce5ccde60f584efd2d5c9e", "tree": "9941428ca273e55c1549c4cd05139f1d12be8b30", "parents": [ "4f4c2655dc3f6fcef766db6e793b1642ad0fd605", "7a8318fb3692a3e4a22ade6f925c77c27a6b07c7" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Mar 18 05:55:45 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Mar 18 05:55:45 2013 -0700" }, "message": "merge in jb-mr2-release history after reset to jb-mr2-dev\n" }, { "commit": "f0eeb53e4763fe5063d3ce880f72d52f136fc3c5", "tree": "36babe49a434552ab0f094a372f1da1cd5ccb993", "parents": [ "4f4c2655dc3f6fcef766db6e793b1642ad0fd605" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Sun Mar 17 03:23:18 2013 -0700" }, "committer": { "name": "Alex Ray", "email": "aray@google.com", "time": "Sun Mar 17 03:23:18 2013 -0700" }, "message": "Camera: fix waitUntilDrained log message\n\nChange-Id: Iab6197e0674752de7933dd812bff430a5c487c4b\n" }, { "commit": "11287471298193ff51ffb429686f5d63a84a621b", "tree": "b3a4e927f0887148de2cce86b01947c699790d9f", "parents": [ "4f4c2655dc3f6fcef766db6e793b1642ad0fd605" ], "author": { "name": "ztenghui", "email": "ztenghui@google.com", "time": "Tue Mar 12 15:43:56 2013 -0700" }, "committer": { "name": "ztenghui", "email": "ztenghui@google.com", "time": "Fri Mar 15 16:16:16 2013 -0700" }, "message": "Add the presentation rotation support\n\nbug:7991013\n\nChange-Id: I10cb034b432876c724baa4974efcb3d67b8a99b6\n" }, { "commit": "be69fcbe131881b776dac0d938611b5e60aa9650", "tree": "9941428ca273e55c1549c4cd05139f1d12be8b30", "parents": [ "0d6e674dd5750e4624b425021ad674a8867e4895", "4f4c2655dc3f6fcef766db6e793b1642ad0fd605" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Mar 15 16:00:58 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 15 16:00:58 2013 +0000" }, "message": "am ee6ad3bd: am 59ac7b30: am 66abe3ae: Merge \"Fix for crash if no content in DESCRIBE response\"\n\n* commit \u0027ee6ad3bd4bfc8e71b3b8c96eb4ea56a592e13e65\u0027:\n Fix for crash if no content in DESCRIBE response\n" }, { "commit": "0d6e674dd5750e4624b425021ad674a8867e4895", "tree": "dea991093f6ff3744515592c89f9c6818da28657", "parents": [ "b13472da435e5a38ed0031a9a18e93051ff7e37e", "b379c219a8d29c2dfa8778e5fb3da80856c30f7e" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Mar 15 16:00:58 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 15 16:00:58 2013 +0000" }, "message": "am 888498ec: am c44a3ae2: am f0cea9f8: Merge \"Prevent invalid frame durations\"\n\n* commit \u0027888498ec8f3c01e39bf0b202fbd926725d9d54a1\u0027:\n Prevent invalid frame durations\n" }, { "commit": "4f4c2655dc3f6fcef766db6e793b1642ad0fd605", "tree": "9941428ca273e55c1549c4cd05139f1d12be8b30", "parents": [ "b379c219a8d29c2dfa8778e5fb3da80856c30f7e", "3cf59c2fc80a142e19d191a923153374fb3a6c22" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Mar 15 08:59:39 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 15 08:59:39 2013 -0700" }, "message": "am 59ac7b30: am 66abe3ae: Merge \"Fix for crash if no content in DESCRIBE response\"\n\n* commit \u002759ac7b3056db57e5a8e851b7946a181c5fc34852\u0027:\n Fix for crash if no content in DESCRIBE response\n" }, { "commit": "b379c219a8d29c2dfa8778e5fb3da80856c30f7e", "tree": "dea991093f6ff3744515592c89f9c6818da28657", "parents": [ "b7be24f055426f00fd1ae1af07d5dd40dbcedfe7", "3550ebddf61e00a5b328b4fe5709c16a8b74b273" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Mar 15 08:59:38 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 15 08:59:38 2013 -0700" }, "message": "am c44a3ae2: am f0cea9f8: Merge \"Prevent invalid frame durations\"\n\n* commit \u0027c44a3ae2704af52c0f4ea006b5b02a53b6df6c46\u0027:\n Prevent invalid frame durations\n" }, { "commit": "3cf59c2fc80a142e19d191a923153374fb3a6c22", "tree": "4b7aa22e9c773350d1f85074aa30b878b631ac6a", "parents": [ "3550ebddf61e00a5b328b4fe5709c16a8b74b273", "ef46e50c29935c16798b172acfb04720ff429690" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Mar 15 08:57:10 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 15 08:57:10 2013 -0700" }, "message": "am 66abe3ae: Merge \"Fix for crash if no content in DESCRIBE response\"\n\n* commit \u002766abe3ae38665256c8fe97770f046bf9c68625aa\u0027:\n Fix for crash if no content in DESCRIBE response\n" }, { "commit": "3550ebddf61e00a5b328b4fe5709c16a8b74b273", "tree": "281f28d30061d682158ef08185aff3e6ecad924a", "parents": [ "1abb9facbbc91c8df629d9b740002d749bc5c2bc", "8f418ef50de8aaf784a932ab4a55bef5df1c4f4d" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Mar 15 08:57:10 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 15 08:57:10 2013 -0700" }, "message": "am f0cea9f8: Merge \"Prevent invalid frame durations\"\n\n* commit \u0027f0cea9f83cf0c8e5ecdd2b401ec2d56d0c717708\u0027:\n Prevent invalid frame durations\n" }, { "commit": "ef46e50c29935c16798b172acfb04720ff429690", "tree": "4b7aa22e9c773350d1f85074aa30b878b631ac6a", "parents": [ "8f418ef50de8aaf784a932ab4a55bef5df1c4f4d", "d32b7b479fad359d7fe779a9c5b4c090cdc14b56" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Mar 15 15:33:00 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Mar 15 15:33:01 2013 +0000" }, "message": "Merge \"Fix for crash if no content in DESCRIBE response\"" }, { "commit": "8f418ef50de8aaf784a932ab4a55bef5df1c4f4d", "tree": "281f28d30061d682158ef08185aff3e6ecad924a", "parents": [ "1a76084dd8918533b00d76fbef15888742f752df", "7c25b029dc9b195fe0c57f3d26ce58f2f83d6867" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Mar 15 15:11:27 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Mar 15 15:11:28 2013 +0000" }, "message": "Merge \"Prevent invalid frame durations\"" }, { "commit": "b13472da435e5a38ed0031a9a18e93051ff7e37e", "tree": "16452ef5ba382cf37a6f63b49f6a399a1cf85d98", "parents": [ "263f50b0806262ba567a8f511e71e4ebe2f41f14", "b7be24f055426f00fd1ae1af07d5dd40dbcedfe7" ], "author": { "name": "Tenghui Zhu", "email": "ztenghui@google.com", "time": "Thu Mar 14 22:45:03 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 14 22:45:03 2013 +0000" }, "message": "am 7d02488e: Merge \"Make limitations of MPEG4Writer explicit\" into jb-mr2-dev\n\n* commit \u00277d02488e0af9f21f5f15abcbd8dd8746606a124c\u0027:\n Make limitations of MPEG4Writer explicit\n" }, { "commit": "b7be24f055426f00fd1ae1af07d5dd40dbcedfe7", "tree": "16452ef5ba382cf37a6f63b49f6a399a1cf85d98", "parents": [ "db57fae81950e32af019b32421b93d204d67e951", "5883d53cf8300d8b13a1a6ef3310d72a55e191c0" ], "author": { "name": "Tenghui Zhu", "email": "ztenghui@google.com", "time": "Thu Mar 14 22:42:44 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Mar 14 22:42:44 2013 +0000" }, "message": "Merge \"Make limitations of MPEG4Writer explicit\" into jb-mr2-dev" }, { "commit": "263f50b0806262ba567a8f511e71e4ebe2f41f14", "tree": "536ada6a8e064ff9adac72a99859ffd0bb13c916", "parents": [ "ef1886ad66173d8a01903fd98c566c1b8880fcef", "db57fae81950e32af019b32421b93d204d67e951" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 14 22:04:40 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 14 22:04:40 2013 +0000" }, "message": "am 1cea316d: Merge \"Parse SBR extension sample rate\" into jb-mr2-dev\n\n* commit \u00271cea316d40b306f5d710175cd77c2ae4161c12e1\u0027:\n Parse SBR extension sample rate\n" }, { "commit": "db57fae81950e32af019b32421b93d204d67e951", "tree": "536ada6a8e064ff9adac72a99859ffd0bb13c916", "parents": [ "26bb1d3702e01779c5ef481c2ad38568d4cc2aa8", "0364a91b4230e5b0631f96579e91a0eb2efa48c3" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 14 22:02:37 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Mar 14 22:02:37 2013 +0000" }, "message": "Merge \"Parse SBR extension sample rate\" into jb-mr2-dev" }, { "commit": "0364a91b4230e5b0631f96579e91a0eb2efa48c3", "tree": "aba5897497b0ceb9a575ed4a1096a9f2d57930ae", "parents": [ "060c68497a9ab59fd71ffbe7c9a7cd3e58489265" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 14 14:50:47 2013 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 14 14:50:47 2013 -0700" }, "message": "Parse SBR extension sample rate\n\nChange-Id: Ib6f6994228a279ee10b389515fba04516c7c42ba\n" }, { "commit": "ef1886ad66173d8a01903fd98c566c1b8880fcef", "tree": "dada4b8289bec91c4832d35c4e3d5ee6b89a3173", "parents": [ "df08f1775f46f9c7df144b18b9fcd1c52dde64da", "26bb1d3702e01779c5ef481c2ad38568d4cc2aa8" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Mar 14 18:39:50 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 14 18:39:50 2013 +0000" }, "message": "am acd695c4: ProCamera: Fix rare deadlock when client destructs inside the connect call\n\n* commit \u0027acd695c42749f8821b0a0cc27739ddf096c6d4e8\u0027:\n ProCamera: Fix rare deadlock when client destructs inside the connect call\n" }, { "commit": "5883d53cf8300d8b13a1a6ef3310d72a55e191c0", "tree": "d280c84919e427787e307504606c5a2527124e59", "parents": [ "dbda1c852d68fde2e729ff2f8e85a406da73994b" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Mar 12 10:40:20 2013 -0700" }, "committer": { "name": "ztenghui", "email": "ztenghui@google.com", "time": "Thu Mar 14 10:47:31 2013 -0700" }, "message": "Make limitations of MPEG4Writer explicit\n\no No more than 2 tracks will be supported\no No more than one video and/or one audio tracks will be supported\no Only take video and/or audio track (for instance, no text tracks)\no If there is no track before start() is called, bail out.\n\nAt the same time, make sure the errors from addSource() report to\naddTrack(), not to start().\n\nBug: 7991013\n\nChange-Id: I1ca35aaeb75b5448d75ed2c6c10dd12ecea720ab\n" }, { "commit": "7a8318fb3692a3e4a22ade6f925c77c27a6b07c7", "tree": "50f65eabb52b7f241baa88268178021bcff5a156", "parents": [ "16b6cbc6eb4a074c2e3e4de740b990137f5940d8", "b7c167a9039151ba32bea61a2e1ee6b0a4ef15fe" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Mar 14 05:55:27 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Mar 14 05:55:27 2013 -0700" }, "message": "merge in jb-mr2-release history after reset to jb-mr2-dev\n" }, { "commit": "26bb1d3702e01779c5ef481c2ad38568d4cc2aa8", "tree": "dada4b8289bec91c4832d35c4e3d5ee6b89a3173", "parents": [ "16b6cbc6eb4a074c2e3e4de740b990137f5940d8" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Mar 13 17:23:00 2013 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Mar 13 17:23:00 2013 -0700" }, "message": "ProCamera: Fix rare deadlock when client destructs inside the connect call\n\nBug: 8337737\nChange-Id: Ia6fca4365fa20fdbfd6a1ec8d047639a002f2aba\n" }, { "commit": "df08f1775f46f9c7df144b18b9fcd1c52dde64da", "tree": "50f65eabb52b7f241baa88268178021bcff5a156", "parents": [ "a8f06e4ad6b53d19e728d20da282a71d37e44232", "16b6cbc6eb4a074c2e3e4de740b990137f5940d8" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Mar 13 21:48:15 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 13 21:48:15 2013 +0000" }, "message": "am f15c0d6d: Merge \"Adds audio support to DirectRenderer.\" into jb-mr2-dev\n\n* commit \u0027f15c0d6d0d80899da9c2d0c479aebc7f42464f27\u0027:\n Adds audio support to DirectRenderer.\n" }, { "commit": "16b6cbc6eb4a074c2e3e4de740b990137f5940d8", "tree": "50f65eabb52b7f241baa88268178021bcff5a156", "parents": [ "8fb6f96e1cc246bc5630e1f5a0eb90f5459331b7", "e2aef54fee88fdeb585a41e1e9834e3d975b263c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Mar 13 21:44:47 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 13 21:44:47 2013 +0000" }, "message": "Merge \"Adds audio support to DirectRenderer.\" into jb-mr2-dev" }, { "commit": "a8f06e4ad6b53d19e728d20da282a71d37e44232", "tree": "50f65eabb52b7f241baa88268178021bcff5a156", "parents": [ "32956f5dd92a695d016942e06a4f9d387b9d7fa0", "8fb6f96e1cc246bc5630e1f5a0eb90f5459331b7" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Mar 13 21:44:34 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 13 21:44:34 2013 +0000" }, "message": "am a32fd0e2: Merge \"remove uses of Surface in favor or IGraphicBufferProducer\" into jb-mr2-dev\n\n* commit \u0027a32fd0e2c7489fa28055595d7c67d857d32566a5\u0027:\n remove uses of Surface in favor or IGraphicBufferProducer\n" }, { "commit": "32956f5dd92a695d016942e06a4f9d387b9d7fa0", "tree": "b0f46115c9b232f23c81e41fa2c6496b109fea94", "parents": [ "b4cfb71abd984af0b6fbe6381334e92439e3d43d", "27d11e240dad419f08e7edcd0857ee7806c65d76" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Mar 13 21:44:30 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 13 21:44:30 2013 +0000" }, "message": "am 9dd73dd2: Merge \"remove CameraServiceTest which wasn\\\u0027t used\" into jb-mr2-dev\n\n* commit \u00279dd73dd2634d41766e6cfd67edd96a018a8ad7d7\u0027:\n remove CameraServiceTest which wasn\u0027t used\n" }, { "commit": "8fb6f96e1cc246bc5630e1f5a0eb90f5459331b7", "tree": "50f65eabb52b7f241baa88268178021bcff5a156", "parents": [ "27d11e240dad419f08e7edcd0857ee7806c65d76", "33da402287605e40e189289b11a08b8f5d515818" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Mar 13 21:42:14 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 13 21:42:14 2013 +0000" }, "message": "Merge \"remove uses of Surface in favor or IGraphicBufferProducer\" into jb-mr2-dev" }, { "commit": "27d11e240dad419f08e7edcd0857ee7806c65d76", "tree": "b0f46115c9b232f23c81e41fa2c6496b109fea94", "parents": [ "e2aef54fee88fdeb585a41e1e9834e3d975b263c", "b05526fc3c0ccc9f9310830074e863212af433e0" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Mar 13 21:40:06 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 13 21:40:07 2013 +0000" }, "message": "Merge \"remove CameraServiceTest which wasn\u0027t used\" into jb-mr2-dev" }, { "commit": "cc82dc6d500023eba6048616301a4b12682458db", "tree": "1f36f887af92cb4bee147e962b85ce10f35d587a", "parents": [ "c93484ab9fdf044fd32f2388a3ce29040d2ba319" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Feb 08 10:18:35 2013 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Mar 13 13:39:48 2013 -0700" }, "message": "Implementing MediaDrm APIs\n\nChange-Id: I9ff8eeb7d0c383b5c0c68cd54eb54ce7d2d22fe6\n" }, { "commit": "b4cfb71abd984af0b6fbe6381334e92439e3d43d", "tree": "f9d6f0943b8c8baaf898db0c7fc263a767d5ac67", "parents": [ "41e7d6195896ff350e40eb0cfb813b8b05acab84", "e2aef54fee88fdeb585a41e1e9834e3d975b263c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Mar 13 16:39:07 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 13 16:39:07 2013 +0000" }, "message": "am 126568c7: Attempt to recover from network stalls by dropping frames on the source side.\n\n* commit \u0027126568c7aeeb5570789e70a310477f44dbdbd885\u0027:\n Attempt to recover from network stalls by dropping frames on the source side.\n" }, { "commit": "e2aef54fee88fdeb585a41e1e9834e3d975b263c", "tree": "f9d6f0943b8c8baaf898db0c7fc263a767d5ac67", "parents": [ "c93484ab9fdf044fd32f2388a3ce29040d2ba319" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Mar 12 15:55:43 2013 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Mar 13 09:25:52 2013 -0700" }, "message": "Attempt to recover from network stalls by dropping frames on the source side.\n\nChange-Id: I5f9eb4f5acb624a9e5bc0087801fb5a4a9ade35c\n" }, { "commit": "b7c167a9039151ba32bea61a2e1ee6b0a4ef15fe", "tree": "2fc7e1214a66459a1fb32ab6f87ee292a0a2e4c4", "parents": [ "c93484ab9fdf044fd32f2388a3ce29040d2ba319", "03dfb8b882eb5b946a2a4b04d7e2e4e98c02c79e" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Mar 13 05:55:28 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Mar 13 05:55:28 2013 -0700" }, "message": "merge in jb-mr2-release history after reset to jb-mr2-dev\n" }, { "commit": "33da402287605e40e189289b11a08b8f5d515818", "tree": "440b60a701b5d4e4d93293732cf5a4a8bef3727c", "parents": [ "b05526fc3c0ccc9f9310830074e863212af433e0" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Mar 12 18:42:23 2013 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Mar 12 18:42:23 2013 -0700" }, "message": "remove uses of Surface in favor or IGraphicBufferProducer\n\nChange-Id: I13d7a9553aa335bca790a3a59d389d7533c83d57\n" }, { "commit": "b05526fc3c0ccc9f9310830074e863212af433e0", "tree": "8dd38d847bffdb4f6e920b90e5b48ecae327b4b7", "parents": [ "9ab909bff49b2eccde1b028901717c193ef723af" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Mar 12 17:40:55 2013 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Mar 12 17:40:55 2013 -0700" }, "message": "remove CameraServiceTest which wasn\u0027t used\n\nthis test hasn\u0027t been compiled or run in a long long time\nand isn\u0027t up to date or relevant.\n\nChange-Id: I5a7f1190d4a783e088d44e3e6ef66231cf0cfb49\n" }, { "commit": "41e7d6195896ff350e40eb0cfb813b8b05acab84", "tree": "2fc7e1214a66459a1fb32ab6f87ee292a0a2e4c4", "parents": [ "9306ad014a372f9f7d3eef02e00776c6e99345e9", "c93484ab9fdf044fd32f2388a3ce29040d2ba319" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Mar 12 20:59:03 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 12 20:59:03 2013 +0000" }, "message": "am c148e7a6: Merge \"Squashed commit of the following:\" into jb-mr2-dev\n\n* commit \u0027c148e7a671c289f82f6ca40e29defcc43e1c6d0b\u0027:\n Squashed commit of the following:\n" }, { "commit": "c93484ab9fdf044fd32f2388a3ce29040d2ba319", "tree": "2fc7e1214a66459a1fb32ab6f87ee292a0a2e4c4", "parents": [ "89bb7e8c9ffdca2b97fce27a166f3edba4be6546", "9dffd24e00a1b2abd5e2dcc2366c0327ec3701b8" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Mar 12 20:57:57 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Mar 12 20:57:58 2013 +0000" }, "message": "Merge \"Squashed commit of the following:\" into jb-mr2-dev" }, { "commit": "9dffd24e00a1b2abd5e2dcc2366c0327ec3701b8", "tree": "593867dda4cf659baf90444ddd152cba2d68c86c", "parents": [ "9ab909bff49b2eccde1b028901717c193ef723af" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Mar 12 11:01:43 2013 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Mar 12 13:44:58 2013 -0700" }, "message": "Squashed commit of the following:\n\ncommit f4edf442741886cdbe071e2d15f6e6247269f7c5\nAuthor: Andreas Huber \u003candih@google.com\u003e\nDate: Tue Mar 12 09:09:18 2013 -0700\n\n Pass additional flags to the sink, use TCP by default in wolfiecast mode.\n\n Change-Id: I41e11a2375d4199656e45c4f149d8441d0016092\n\ncommit 6302602ed280a38287f507159abfb40a1da38c5a\nAuthor: Andreas Huber \u003candih@google.com\u003e\nDate: Tue Mar 12 08:51:58 2013 -0700\n\n tweaks\n\n Change-Id: Ie29e422d7258be522f4bb1f6c5afcf74c937e547\n\ncommit a38a860e4979ba563cadbaafa21b084439449d26\nAuthor: Andreas Huber \u003candih@google.com\u003e\nDate: Mon Mar 11 16:57:43 2013 -0700\n\n Report average lateness all the way from NuPlayerRenderer...\n\n Change-Id: I2e7700703ae656515e44b9c25610d26c75778111\n\ncommit a7d49b11675ea88be4029dd8451d1649db94571d\nAuthor: Andreas Huber \u003candih@google.com\u003e\nDate: Mon Mar 11 14:54:19 2013 -0700\n\n Make TimeSyncer smarter, enable TunnelRenderer\n\n Change-Id: I27377a60cd8feb01589da456967fddd34532c20e\n\ncommit 0f214c8ef68179f7b61512c37040939554013151\nAuthor: Andreas Huber \u003candih@google.com\u003e\nDate: Thu Mar 7 15:57:56 2013 -0800\n\n convert source timestamps to sink timestamps, report lateness.\n\n Change-Id: I051a60fbbceca2f7b508ae3dac6e01e402bae39e\n\ncommit 04a4f8e16bad09157b5615a5fa45310438955832\nAuthor: Andreas Huber \u003candih@google.com\u003e\nDate: Thu Mar 7 09:00:28 2013 -0800\n\n Sync time between sink and source.\n\n Change-Id: Ie8b4d75c957aa48310e7c81d1279761b9f821efe\n\ncommit aebe20e6184e3636a99082f8ece08e708015cb8d\nAuthor: Andreas Huber \u003candih@google.com\u003e\nDate: Wed Mar 6 09:03:12 2013 -0800\n\n play with back pressure\n\n Change-Id: I51eb69257e6a79e76f5f9c75ff99d8adbd083947\n\nChange-Id: Ifdf57228667fed7fc71c5090a2c3f7cea1037c5c\n" }, { "commit": "9306ad014a372f9f7d3eef02e00776c6e99345e9", "tree": "7278c440ab2164177b878dc00dbd63284230e255", "parents": [ "18311433f8d5680ae03161fc7469f1fbbf30abc0", "89bb7e8c9ffdca2b97fce27a166f3edba4be6546" ], "author": { "name": "Andy McFadden", "email": "fadden@android.com", "time": "Tue Mar 12 19:33:09 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 12 19:33:09 2013 +0000" }, "message": "am 2a5177e8: Merge \"GraphicBufferSource fixes\" into jb-mr2-dev\n\n* commit \u00272a5177e8a72585b6f4da972d86f436d31cd4674a\u0027:\n GraphicBufferSource fixes\n" }, { "commit": "89bb7e8c9ffdca2b97fce27a166f3edba4be6546", "tree": "7278c440ab2164177b878dc00dbd63284230e255", "parents": [ "9ab909bff49b2eccde1b028901717c193ef723af", "0c37f9d1320bb87fd242f9425c67dacd6ce20112" ], "author": { "name": "Andy McFadden", "email": "fadden@android.com", "time": "Tue Mar 12 19:29:23 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Mar 12 19:29:23 2013 +0000" }, "message": "Merge \"GraphicBufferSource fixes\" into jb-mr2-dev" }, { "commit": "0c37f9d1320bb87fd242f9425c67dacd6ce20112", "tree": "1fa9780cf35055d9c826b4ca124df552e3871bfe", "parents": [ "dbda1c852d68fde2e729ff2f8e85a406da73994b" ], "author": { "name": "Andy McFadden", "email": "fadden@android.com", "time": "Mon Mar 11 15:09:32 2013 -0700" }, "committer": { "name": "Andy McFadden", "email": "fadden@android.com", "time": "Tue Mar 12 12:27:02 2013 -0700" }, "message": "GraphicBufferSource fixes\n\nVarious fixes:\n- Set the maximum number of BQ buffers we\u0027re allowed to\n acquire equal to the actual number of codec buffers. That\n way we keep the codec as full as possible, and never try to\n acquire more than we\u0027re allowed from the BufferQueue.\n- Actually use \"end of stream sent\" flag.\n- Name the BufferQueue (for debug messages).\n\nBug 8359403\n\nChange-Id: I3b8c1f679bbebf6a89e623e13ca029eda7f657ba\n" }, { "commit": "18311433f8d5680ae03161fc7469f1fbbf30abc0", "tree": "a1fe090a01e2f23f84f04326c4224a70ecf627ef", "parents": [ "1f42b3e3c6e86fb1cd2ca935944aabfc88efb388", "03dfb8b882eb5b946a2a4b04d7e2e4e98c02c79e" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Mar 12 07:14:32 2013 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Mar 12 07:14:32 2013 -0700" }, "message": "Reconcile with jb-mr2-release - do not merge\n\nChange-Id: I38afc7daea87354abdce7a86d78b56f461750b04\n" }, { "commit": "03dfb8b882eb5b946a2a4b04d7e2e4e98c02c79e", "tree": "a1fe090a01e2f23f84f04326c4224a70ecf627ef", "parents": [ "9ab909bff49b2eccde1b028901717c193ef723af", "73e10abac59963235b5c236ca1c8f3375d748fe0" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Mar 12 05:55:35 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Mar 12 05:55:35 2013 -0700" }, "message": "merge in jb-mr2-release history after reset to jb-mr2-dev\n" }, { "commit": "7c25b029dc9b195fe0c57f3d26ce58f2f83d6867", "tree": "281f28d30061d682158ef08185aff3e6ecad924a", "parents": [ "1a76084dd8918533b00d76fbef15888742f752df" ], "author": { "name": "Ola Andersson", "email": "ola3.andersson@sonymobile.com", "time": "Wed Dec 05 13:07:58 2012 +0100" }, "committer": { "name": "Takeshi Aimi", "email": "takeshi.aimi@sonymobile.com", "time": "Tue Mar 12 20:16:35 2013 +0900" }, "message": "Prevent invalid frame durations\n\nPrevent frame duration from being negative when\nexporting movie studio project\n\nChange-Id: I459fb243650c777c2b59d1094acc88c3a944bd81\n" }, { "commit": "d32b7b479fad359d7fe779a9c5b4c090cdc14b56", "tree": "58977eaeffaccd3630339af19d636da08580eed8", "parents": [ "1a76084dd8918533b00d76fbef15888742f752df" ], "author": { "name": "Xuefei Chen", "email": "xuefei.chen@sonymobile.com", "time": "Mon Jan 07 16:43:13 2013 +0800" }, "committer": { "name": "Takeshi Aimi", "email": "takeshi.aimi@sonymobile.com", "time": "Tue Mar 12 19:35:23 2013 +0900" }, "message": "Fix for crash if no content in DESCRIBE response\n\nIf DESCRIBE response is received with status 200 but no content,\nMyHandler will still set content data for session description\nparsing. This will cause NULL Pointer crash.\nThis fix checks whether DESCRIBE response has content before\nparsing session description.\n\nChange-Id: I114ae6fd54ce804e61718f62618ca9008425a433\n" }, { "commit": "1f42b3e3c6e86fb1cd2ca935944aabfc88efb388", "tree": "a1fe090a01e2f23f84f04326c4224a70ecf627ef", "parents": [ "01534d80e58627ab597b312d5b0e5d9f1835edf2", "9ab909bff49b2eccde1b028901717c193ef723af" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 11 23:38:44 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 11 23:38:44 2013 +0000" }, "message": "am e6800cea: Camera: Make ProCamera connect take the same paths as Camera connect\n\n* commit \u0027e6800cea0678dbc0bf697b44c3e4548b0253085c\u0027:\n Camera: Make ProCamera connect take the same paths as Camera connect\n" }, { "commit": "01534d80e58627ab597b312d5b0e5d9f1835edf2", "tree": "842fc07ade8a885e0549d366b81e985bbb313dd6", "parents": [ "d667f79efdd71d318217e8a6763ca93abf289e07", "7cf9a7e7d19579565e0f9dba8be9c107f2dbf548" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 11 23:38:44 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 11 23:38:44 2013 +0000" }, "message": "am fa4cf9d3: (Camera)ProCamera: Remove unused functions from binder interface\n\n* commit \u0027fa4cf9d310685b4c25877cba772ff7da84caf517\u0027:\n (Camera)ProCamera: Remove unused functions from binder interface\n" }, { "commit": "d667f79efdd71d318217e8a6763ca93abf289e07", "tree": "608f234db150d2805d0d3f0c42e29073fb8ba34e", "parents": [ "0b65c37f6cfcc59a92f1e7fca703b28322dc6f59", "71381051e2d048b2705c447b3d59db6e972493ee" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 11 23:38:43 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 11 23:38:43 2013 +0000" }, "message": "am ce124da1: (Camera)FrameProcessor: Refactor to share code with ProFrameProcessor\n\n* commit \u0027ce124da179775a81ad7dcc3f33315eca451e66f2\u0027:\n (Camera)FrameProcessor: Refactor to share code with ProFrameProcessor\n" }, { "commit": "0b65c37f6cfcc59a92f1e7fca703b28322dc6f59", "tree": "e227cb82c2473d654fd9429d71733fc5a241b604", "parents": [ "fe773185edf397683089aff10aff8af074be4526", "a2e203bdb911bd5595723651d06ad91c330a7873" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 11 23:38:43 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 11 23:38:43 2013 +0000" }, "message": "am 44cfcf00: CameraService: Refactor Camera2Client to share a base with ProCameraClient\n\n* commit \u002744cfcf00b9008c1c04f4c8277c6c06af039fd976\u0027:\n CameraService: Refactor Camera2Client to share a base with ProCameraClient\n" }, { "commit": "9ab909bff49b2eccde1b028901717c193ef723af", "tree": "a1fe090a01e2f23f84f04326c4224a70ecf627ef", "parents": [ "7cf9a7e7d19579565e0f9dba8be9c107f2dbf548" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 04 17:25:57 2013 -0800" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 11 16:32:24 2013 -0700" }, "message": "Camera: Make ProCamera connect take the same paths as Camera connect\n\n* ProCamera uses the app ops manager\n* Refactored connect calls to be as common as possible\n* Removed some useless not implemented function calls in ProClient\n\nChange-Id: I5dab30d20f0c202a494a07b2cfe4c1fa04a2a076\n" }, { "commit": "7cf9a7e7d19579565e0f9dba8be9c107f2dbf548", "tree": "842fc07ade8a885e0549d366b81e985bbb313dd6", "parents": [ "71381051e2d048b2705c447b3d59db6e972493ee" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 04 16:14:23 2013 -0800" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 11 16:32:24 2013 -0700" }, "message": "(Camera)ProCamera: Remove unused functions from binder interface\n\nChange-Id: I0582268cef6e84b630bc87c8a03dcd69d54c440d\n" }, { "commit": "71381051e2d048b2705c447b3d59db6e972493ee", "tree": "608f234db150d2805d0d3f0c42e29073fb8ba34e", "parents": [ "a2e203bdb911bd5595723651d06ad91c330a7873" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 04 14:53:08 2013 -0800" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 11 16:32:24 2013 -0700" }, "message": "(Camera)FrameProcessor: Refactor to share code with ProFrameProcessor\n\nChange-Id: Ie8cd0df7caf83f9d0134f560ae31ab72f2f7d1fc\n" }, { "commit": "a2e203bdb911bd5595723651d06ad91c330a7873", "tree": "e227cb82c2473d654fd9429d71733fc5a241b604", "parents": [ "954a8902f7a6521e110005b4f9490a2fd5be9fe9" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Mar 01 16:22:28 2013 -0800" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 11 16:32:24 2013 -0700" }, "message": "CameraService: Refactor Camera2Client to share a base with ProCameraClient\n\nChange-Id: I249e2a0fc47ae84f29c9d9c4a223fba13da3ee66\n" }, { "commit": "fe773185edf397683089aff10aff8af074be4526", "tree": "47e6488f95e866c8d1fbbdf1a44b5384a955a17e", "parents": [ "682611721b304a3407c631b785d8a9466a6d589f", "954a8902f7a6521e110005b4f9490a2fd5be9fe9" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Mar 11 22:58:00 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 11 22:58:00 2013 +0000" }, "message": "am 840b2613: Merge \"Increase size of statistics buffer\" into jb-mr2-dev\n\n* commit \u0027840b2613863218fe6198dca817cc33ce76cdbfb7\u0027:\n Increase size of statistics buffer\n" }, { "commit": "954a8902f7a6521e110005b4f9490a2fd5be9fe9", "tree": "47e6488f95e866c8d1fbbdf1a44b5384a955a17e", "parents": [ "d1e1aac0a3a2454402310340c50a54b8d0c43ac0", "75d1ef97d9799061be9631b08b56592a7cea6013" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Mar 11 22:55:17 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Mar 11 22:55:17 2013 +0000" }, "message": "Merge \"Increase size of statistics buffer\" into jb-mr2-dev" }, { "commit": "682611721b304a3407c631b785d8a9466a6d589f", "tree": "53bccb4964a3d3b1063237b5b10eeb80eb1b6d2d", "parents": [ "869114165f8c68c4622592bedb87dd933169805f", "d1e1aac0a3a2454402310340c50a54b8d0c43ac0" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Mar 11 20:49:09 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 11 20:49:09 2013 +0000" }, "message": "am b4d92c5b: am c5604b08: am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge\n\n* commit \u0027b4d92c5b79be5557318e3636a31e9ff8249bec8e\u0027:\n" }, { "commit": "d1e1aac0a3a2454402310340c50a54b8d0c43ac0", "tree": "53bccb4964a3d3b1063237b5b10eeb80eb1b6d2d", "parents": [ "dbda1c852d68fde2e729ff2f8e85a406da73994b", "1abb9facbbc91c8df629d9b740002d749bc5c2bc" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Mar 11 13:44:22 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 11 13:44:22 2013 -0700" }, "message": "am c5604b08: am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge\n\n* commit \u0027c5604b081b6cac558ed94dce88dedf1a467185b7\u0027:\n" }, { "commit": "1abb9facbbc91c8df629d9b740002d749bc5c2bc", "tree": "31241ba242b5cf8c9c93a6ef1ee2eb1ca19cd101", "parents": [ "1a76084dd8918533b00d76fbef15888742f752df", "15a315776514955bfd04d5cd53a10171583d622f" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Mar 11 13:13:28 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 11 13:13:28 2013 -0700" }, "message": "am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge\n\n* commit \u00270fe40641db3759088edc1bc7f0182556d77bede6\u0027:\n" }, { "commit": "15a315776514955bfd04d5cd53a10171583d622f", "tree": "e9bdb0a8eef7eff82045b95e8cfcb26d3807ef6b", "parents": [ "64143ff27c2ffd8bd91ee9451305704e6b54ac6e", "0a6fba48af31916208a20b2bf142ac7dea0a014a" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Mar 11 13:00:27 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 11 13:00:27 2013 -0700" }, "message": "am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge\n\n* commit \u002772c7cf9d13f5a51a71dccc6d94317727bd0feec3\u0027:\n" }, { "commit": "0a6fba48af31916208a20b2bf142ac7dea0a014a", "tree": "429519b3bd4fbc7f47ee2be82f2778ef1545fbdd", "parents": [ "ef5abc369823f634c460c8f24d3cbf310542fe3b", "ca53acd700fb14a863d4b84f976698de0fc82af8" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Mar 11 12:41:47 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 11 12:41:47 2013 -0700" }, "message": "am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge\n\n* commit \u0027a1b1e2de67ed5ed3dfa8c8e9554bb0f0ab18a71c\u0027:\n" }, { "commit": "ca53acd700fb14a863d4b84f976698de0fc82af8", "tree": "429519b3bd4fbc7f47ee2be82f2778ef1545fbdd", "parents": [ "ef5abc369823f634c460c8f24d3cbf310542fe3b", "5fa506c7a1de3f4063f04beb4aa0900bdd4a7a1e" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Mar 11 12:23:04 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 11 12:23:04 2013 -0700" }, "message": "am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge\n\n* commit \u002756f387a4a8f319f3e6080b5e5963a4b177053cbe\u0027:\n" }, { "commit": "5fa506c7a1de3f4063f04beb4aa0900bdd4a7a1e", "tree": "3090340b35cf168294f5c1f2bc287dfcc626c5a0", "parents": [ "7b4262221c06951e9df75d5414c0a7daab365177", "c2d98f3376f1ce8178e7c2ba6dd20dbbcfcdb73f" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Mar 11 12:19:00 2013 -0700" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Mar 11 12:19:00 2013 -0700" }, "message": "Reconcile with jb-mr1-release - do not merge\n" }, { "commit": "75d1ef97d9799061be9631b08b56592a7cea6013", "tree": "47e6488f95e866c8d1fbbdf1a44b5384a955a17e", "parents": [ "dbda1c852d68fde2e729ff2f8e85a406da73994b" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Mar 11 10:58:50 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Mar 11 10:58:50 2013 -0700" }, "message": "Increase size of statistics buffer\n\nBug: 8354576\nChange-Id: I327e9dc203e09df8abc21e589ce9056540618abd\n" }, { "commit": "73e10abac59963235b5c236ca1c8f3375d748fe0", "tree": "53bccb4964a3d3b1063237b5b10eeb80eb1b6d2d", "parents": [ "dbda1c852d68fde2e729ff2f8e85a406da73994b", "d22436aac1f61a60ad9dd220efcfd0016f2f1a41" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Mar 11 05:55:54 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Mar 11 05:55:54 2013 -0700" }, "message": "merge in jb-mr2-release history after reset to jb-mr2-dev\n" }, { "commit": "869114165f8c68c4622592bedb87dd933169805f", "tree": "53bccb4964a3d3b1063237b5b10eeb80eb1b6d2d", "parents": [ "26402f2cf946e95da4b9af68c9957eeb64f247e0", "dbda1c852d68fde2e729ff2f8e85a406da73994b" ], "author": { "name": "ztenghui", "email": "ztenghui@google.com", "time": "Fri Mar 08 23:18:09 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 08 23:18:09 2013 +0000" }, "message": "am 70369845: Merge \"Clean up the native code to match Java update\" into jb-mr2-dev\n\n* commit \u002770369845f8250df4f6f22c336414b4df0a3ce53e\u0027:\n Clean up the native code to match Java update\n" }, { "commit": "dbda1c852d68fde2e729ff2f8e85a406da73994b", "tree": "53bccb4964a3d3b1063237b5b10eeb80eb1b6d2d", "parents": [ "96aeef2b4f51b06cb7f9ccbb04df48b305550b67", "afde4e56566af19b36f1fe5e7aa7f226bf1703dd" ], "author": { "name": "ztenghui", "email": "ztenghui@google.com", "time": "Fri Mar 08 23:13:07 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 08 23:13:08 2013 +0000" }, "message": "Merge \"Clean up the native code to match Java update\" into jb-mr2-dev" } ], "next": "afde4e56566af19b36f1fe5e7aa7f226bf1703dd" }