)]}' { "log": [ { "commit": "1a7be1ec9c769203e6c8e26378de0ab8e2ad493d", "tree": "68773b199cc4adcb96124270863244477570c78e", "parents": [ "f131f87369ec06fc27fc1f14ea72f0ca1a066509", "91820d46b5f3065c2fded3cdf65d305715b33bb1" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 29 11:34:16 2014 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Apr 29 11:34:16 2014 -0700" }, "message": "Merge commit \u002791820d46b5f3065c2fded3cdf65d305715b33bb1\u0027 into HEAD\n" }, { "commit": "f131f87369ec06fc27fc1f14ea72f0ca1a066509", "tree": "c2df92dbe30769db409737fd29fdb96b4546fa17", "parents": [ "4513aa2cda9e636e4ac675dab9a1353b22e951ae", "92dfd8e67e099577d07eaeb28aad533fd5514d8a" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Apr 28 22:43:21 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Apr 28 22:43:21 2014 +0000" }, "message": "Merge \"Add private method NBLog::Reader::dumpLine()\"" }, { "commit": "92dfd8e67e099577d07eaeb28aad533fd5514d8a", "tree": "c2df92dbe30769db409737fd29fdb96b4546fa17", "parents": [ "4513aa2cda9e636e4ac675dab9a1353b22e951ae" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Jul 11 14:29:59 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Mon Apr 28 14:10:21 2014 -0700" }, "message": "Add private method NBLog::Reader::dumpLine()\n\nThis allows us to abstract out fdprintf vs ALOGI\nso that callers don\u0027t need an \u0027if\u0027 at every location.\n\nChange-Id: I4c68185fc19f32caeaed93347e6b7d09b8d4c4d8\n" }, { "commit": "4513aa2cda9e636e4ac675dab9a1353b22e951ae", "tree": "546a77e6c051d4096a60295d7bb259d9c6e771bb", "parents": [ "95006625bd1c562c952833bf08c52e7e6c524363", "12b44bd5fe3069cd3450d05b6c446b600e0553d3" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Apr 23 23:45:27 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Apr 23 23:45:27 2014 +0000" }, "message": "Merge \"AArch64: rewrite audioflinger\u0027s sinc resample by intrinsics.\"" }, { "commit": "95006625bd1c562c952833bf08c52e7e6c524363", "tree": "d9899d5099e542a7a56895e6f8381fba7a41bdac", "parents": [ "27158eb55de8150258faba6574fc51c7aa641516", "e5e3d0823165dea9211a47232dbbbe361153fb49" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Apr 21 20:22:53 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Apr 21 20:22:54 2014 +0000" }, "message": "Merge \"camera: set mNeedConfig after creating ZSL stream\"" }, { "commit": "27158eb55de8150258faba6574fc51c7aa641516", "tree": "3ec5f60f35728d4e2a25d2f19b863fbb1aa41605", "parents": [ "e0f20cea4a40deaabd2b409ab301f6fd7b2e8e7f", "ef80764db37aa00bbb88755cb6cf11c6f2720bd3" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon Apr 21 20:21:42 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Apr 21 20:21:43 2014 +0000" }, "message": "Merge \"AArch64: AString::append for longs and pointers\"" }, { "commit": "e0f20cea4a40deaabd2b409ab301f6fd7b2e8e7f", "tree": "406ac589b6b1cf7efaef89723fd0b8de5e5e2b91", "parents": [ "cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed", "7cb0e733210c2ce7dd2a7c9d32f6d83c4dab9656" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 18 22:03:45 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Apr 18 22:03:45 2014 +0000" }, "message": "Merge \"libeffects: 64 bit compile issues\"" }, { "commit": "7cb0e733210c2ce7dd2a7c9d32f6d83c4dab9656", "tree": "406ac589b6b1cf7efaef89723fd0b8de5e5e2b91", "parents": [ "cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 18 13:48:25 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 18 13:57:58 2014 -0700" }, "message": "libeffects: 64 bit compile issues\n\nChange-Id: I32dd13d307572fee91150f8e113df78924ca0067\n" }, { "commit": "cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed", "tree": "32191d574c9a8ba8e66398ab375be118c37b3e86", "parents": [ "839d11d1f7be9dff2f06c7d30a9eb39cb6782078", "3b5ec66c3623647fc4dfd1a446c4f25a2c7f1ba0" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 22:31:39 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Apr 15 22:31:39 2014 +0000" }, "message": "Merge \"media: -Werror re-enabled\"" }, { "commit": "839d11d1f7be9dff2f06c7d30a9eb39cb6782078", "tree": "a50053c391da8c02797158395f2ecfec83218855", "parents": [ "1df2557ac95a6d8a087fb15f6f842dc049f2759b", "3ab368e0810d894dcbc0971350c095049478a055" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 22:28:34 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Apr 15 22:28:34 2014 +0000" }, "message": "Merge changes I0a744dc7,Id993a70d\n\n* changes:\n media: use size_t for integer iterator to Vector::size()\n media: 64 bit compile issues\n" }, { "commit": "3ab368e0810d894dcbc0971350c095049478a055", "tree": "a50053c391da8c02797158395f2ecfec83218855", "parents": [ "db43b34c3428e480f8c4c66e7e88f4001f37f91e" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 14:55:53 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 14:57:31 2014 -0700" }, "message": "media: use size_t for integer iterator to Vector::size()\n\nChange-Id: I0a744dc7815a86a993df9b0623440be620ec8903\n" }, { "commit": "db43b34c3428e480f8c4c66e7e88f4001f37f91e", "tree": "be194bf06c84b61f277a1c29c7499aa7862494a4", "parents": [ "1df2557ac95a6d8a087fb15f6f842dc049f2759b" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 04 14:47:28 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 13:18:22 2014 -0700" }, "message": "media: 64 bit compile issues\n\n- change internal sized types to use stdint.h\n- printf \u0026 scanf formats\n- size_t or unsigned int for iterators\n\nChange-Id: Id993a70d8bf54c667c5d652b34179a2c727ed446\n" }, { "commit": "1df2557ac95a6d8a087fb15f6f842dc049f2759b", "tree": "cd9a485dbacf0b86b2d6b7cb6a338e32aacd99b1", "parents": [ "432ed3d66d09464778df31c73374ee897f7b8840", "cd1e05b3601e1d84f55231bdc3f232a1cee7f622" ], "author": { "name": "Dmitriy Ivanov", "email": "dimitry@google.com", "time": "Tue Apr 15 19:37:19 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Apr 15 19:37:19 2014 +0000" }, "message": "Merge \"Remove code markers\"" }, { "commit": "cd1e05b3601e1d84f55231bdc3f232a1cee7f622", "tree": "cd9a485dbacf0b86b2d6b7cb6a338e32aacd99b1", "parents": [ "432ed3d66d09464778df31c73374ee897f7b8840" ], "author": { "name": "Dmitriy Ivanov", "email": "dimitry@google.com", "time": "Tue Apr 15 12:10:43 2014 -0700" }, "committer": { "name": "Dmitriy Ivanov", "email": "dimitry@google.com", "time": "Tue Apr 15 12:10:43 2014 -0700" }, "message": "Remove code markers\n\nChange-Id: Iaebfaef2e58e9659d86699d9b7fc68f24cf09bf3\n" }, { "commit": "3b5ec66c3623647fc4dfd1a446c4f25a2c7f1ba0", "tree": "3958512f70c1b00e6bc43ba63fb8d9057cc87922", "parents": [ "432ed3d66d09464778df31c73374ee897f7b8840" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Mon Apr 14 12:51:07 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 12:08:21 2014 -0700" }, "message": "media: -Werror re-enabled\n\nChange-Id: I62fdb78e8acefafd468ce2e5aa9e78eba0dd0f48\n" }, { "commit": "432ed3d66d09464778df31c73374ee897f7b8840", "tree": "7278734ca980774c0ec5b5d6baa30a8587136eb0", "parents": [ "9829344d526f87ca745208f04216ec795b239581", "f6d0c1fd6d9e697bb3a891fae14c7e9d4b685de6" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 14:30:03 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Apr 15 14:30:04 2014 +0000" }, "message": "Merge \"libstagefright: fix 64-bit warnings\"" }, { "commit": "e5e3d0823165dea9211a47232dbbbe361153fb49", "tree": "cd6c0333bcfe5e3a87d00a9095e09c3ffaef62a4", "parents": [ "4f53fe74051026e6635ba5bdbed4f1898cb66028" ], "author": { "name": "Yuvraj Pasi", "email": "ypasi@nvidia.com", "time": "Tue Apr 15 18:37:45 2014 +0530" }, "committer": { "name": "Yuvraj Pasi", "email": "ypasi@nvidia.com", "time": "Tue Apr 15 18:37:45 2014 +0530" }, "message": "camera: set mNeedConfig after creating ZSL stream\n\nSet mNeedConfig after creating ZSL stream, camera device\nwill reconfigure for the case when only ZSL stream\nis changed.\n\nChange-Id: Ib592817f81125969824a1280349f77973116f375\n" }, { "commit": "ef80764db37aa00bbb88755cb6cf11c6f2720bd3", "tree": "2adc4fe23addd6229400624ecb760a44744b42d7", "parents": [ "9829344d526f87ca745208f04216ec795b239581" ], "author": { "name": "Marcus Oakland", "email": "marcus.oakland@arm.com", "time": "Tue Mar 25 17:32:00 2014 +0000" }, "committer": { "name": "Ashok Bhat", "email": "ashok.bhat@arm.com", "time": "Tue Apr 15 13:58:18 2014 +0100" }, "message": "AArch64: AString::append for longs and pointers\n\nThe AString::append methods for long, unsigned long and void *\npointers were using char arrays of 16 elements, which were not long\nenough for 64-bit longs and pointers in __LP64__ systems. This\nresulted in \"FORTIFY_SOURCE: vsprintf: prevented write past end of\nbuffer. Calling abort().\" when the\nandroid.media.cts.DecoderTest#testFlush CTS test was run.\n\nThe AString::append methods that were using sprintf have been modifed\nto use snprintf instead, taking the sizeof the \"s\" array (which has\nbeen made 32 char without conditional compilation for __LP64__ where\nappropriate), and checking the return value to ensure that the string\nhas not been truncated.\n\nAfter this change and changes to the types of OMX_U32 and OMX_S32 in the\nframeworks/native/include/media/openmax/OMX_Types.h header file, the\nandroid.media.cts.DecoderTest#testFlush CTS test passes.\n\nChange-Id: I76d897373473c82f52986f43a15b050b844a370a\nSigned-off-by: Marcus Oakland \u003cmarcus.oakland@arm.com\u003e\n" }, { "commit": "f6d0c1fd6d9e697bb3a891fae14c7e9d4b685de6", "tree": "7278734ca980774c0ec5b5d6baa30a8587136eb0", "parents": [ "9829344d526f87ca745208f04216ec795b239581" ], "author": { "name": "Colin Cross", "email": "ccross@google.com", "time": "Mon Apr 14 17:12:27 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Mon Apr 14 17:16:02 2014 -0700" }, "message": "libstagefright: fix 64-bit warnings\n\n%lld -\u003e %\" PRId64 \" for int64_t\n%d -\u003e %zu for size_t\nAlso fixes some casts from void* to integer types, and some comparisons\nbetween signed and unsigned.\n\n(cherry picked from commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)\n\nChange-Id: I76ba94d0b67776fd7abdc83b43d47c61d6c32f4c\n" }, { "commit": "9829344d526f87ca745208f04216ec795b239581", "tree": "84aef000929bcac9b87144e380e15587534f6e95", "parents": [ "e523889332b88348e673137d272854278acbef8f", "d6579cc9f06052f94bf5a2c34261c84de0efce23" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Mon Apr 14 18:01:24 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Apr 14 18:01:24 2014 +0000" }, "message": "Merge \"media: memset sizeof argument issues\"" }, { "commit": "e523889332b88348e673137d272854278acbef8f", "tree": "82f9fd986b28db58f18f80e9e2033a8e1fe48be6", "parents": [ "a133bc87eb8269a6fa61772cb708f10c9c3b7a87", "4850983c3a9131af32d0fe61dd9ce3d1e5d735b5" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 21:57:21 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Apr 11 21:57:22 2014 +0000" }, "message": "Merge \"Fix aosp_arm64 mirror-aosp-master build 1119326\"" }, { "commit": "4850983c3a9131af32d0fe61dd9ce3d1e5d735b5", "tree": "82f9fd986b28db58f18f80e9e2033a8e1fe48be6", "parents": [ "a133bc87eb8269a6fa61772cb708f10c9c3b7a87" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 14:29:37 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 14:54:52 2014 -0700" }, "message": "Fix aosp_arm64 mirror-aosp-master build 1119326\n\nRemove -Werror that was set in \u0027warnings be gone\u0027\n\nChange-Id: I2379dc56f04a6d0ac50f90e6d1cdf05fce3a5c30\n" }, { "commit": "d6579cc9f06052f94bf5a2c34261c84de0efce23", "tree": "19a65464efb5c70b2e656053f53a1d0db5039ac9", "parents": [ "a133bc87eb8269a6fa61772cb708f10c9c3b7a87" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Thu Apr 10 09:37:52 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 11:25:19 2014 -0700" }, "message": "media: memset sizeof argument issues\n\nChange-Id: I37ef154eea0f77fb7f22faf6891f3025f6ff346e\n" }, { "commit": "a133bc87eb8269a6fa61772cb708f10c9c3b7a87", "tree": "90e860a944b0dd22e95146f5bbae79e3f18b33a0", "parents": [ "0938c6f7a1e713030b04e32548012f0c29c94f4d", "effbb3a9b72050dbe150af7302d9148fe7e927d3" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 18:24:17 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Apr 11 18:24:17 2014 +0000" }, "message": "Merge \"build fix for aosp-idea133 @ 1119318\"" }, { "commit": "0938c6f7a1e713030b04e32548012f0c29c94f4d", "tree": "b0b4122174721e31b1be7b39bfc9d24a00cf5265", "parents": [ "2a27a640d0d9747659cc609b4384ffead090866e", "bc64e09a65bd5ba97706d2420449b9710c9e9c01" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 18:21:02 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Apr 11 18:21:03 2014 +0000" }, "message": "Merge \"warnings be gone (4/4)\"" }, { "commit": "bc64e09a65bd5ba97706d2420449b9710c9e9c01", "tree": "b0b4122174721e31b1be7b39bfc9d24a00cf5265", "parents": [ "2a27a640d0d9747659cc609b4384ffead090866e" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 09:50:45 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 18:20:54 2014 +0000" }, "message": "warnings be gone (4/4)\n\n(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)\n(squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)\n\nChange-Id: I55df09714a0e1cb98a44c8fcddac2c646ae5e139" }, { "commit": "2a27a640d0d9747659cc609b4384ffead090866e", "tree": "2bfacc25072276b6d6d60aa5bbd0b34a708c78a5", "parents": [ "797248568b5ba32606ac0d8de024190e3cc95973", "51b9eb1c330d23b98ddb629200cd177bc9c39def" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 18:20:39 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Apr 11 18:20:39 2014 +0000" }, "message": "Merge \"warnings be gone (3/4)\"" }, { "commit": "51b9eb1c330d23b98ddb629200cd177bc9c39def", "tree": "2bfacc25072276b6d6d60aa5bbd0b34a708c78a5", "parents": [ "797248568b5ba32606ac0d8de024190e3cc95973" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 09:49:23 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 18:20:27 2014 +0000" }, "message": "warnings be gone (3/4)\n\n(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)\n(squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)\n\nChange-Id: I0c5a0c3ea32bb5091d90c7391c67edd02e50397f" }, { "commit": "797248568b5ba32606ac0d8de024190e3cc95973", "tree": "068991ca962780f139d0e752980f728324fdae5f", "parents": [ "52a861d2825544fe2eb90f8e5f6351d02ff95536", "3f37c83d9817cacc0965ca66873b0353fac07228" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 18:20:12 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Apr 11 18:20:12 2014 +0000" }, "message": "Merge \"warnings be gone (2/4)\"" }, { "commit": "3f37c83d9817cacc0965ca66873b0353fac07228", "tree": "068991ca962780f139d0e752980f728324fdae5f", "parents": [ "52a861d2825544fe2eb90f8e5f6351d02ff95536" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 09:47:30 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 18:19:51 2014 +0000" }, "message": "warnings be gone (2/4)\n\n(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)\n(squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)\n\nChange-Id: I048a2c6868515716c7cd7319a3d0abe6311dac4e" }, { "commit": "effbb3a9b72050dbe150af7302d9148fe7e927d3", "tree": "29d9f0e663e597b07bd0807e9e6db40dbf64cc8d", "parents": [ "52a861d2825544fe2eb90f8e5f6351d02ff95536" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 11:01:18 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 11:01:18 2014 -0700" }, "message": "build fix for aosp-idea133 @ 1119318\n\nChange-Id: I34084ebb48318628d46c2ff7ca567bd7638619e4\n" }, { "commit": "52a861d2825544fe2eb90f8e5f6351d02ff95536", "tree": "e1c9e21525348fe826b91ecee7075ccb743f843d", "parents": [ "51b3ea2b8f7298bffbd246c65a606cd053357b66", "d411b4ca2945cd8974a3a78199fce94646950128" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 17:20:54 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Apr 11 17:20:55 2014 +0000" }, "message": "Merge \"warnings be gone.\"" }, { "commit": "d411b4ca2945cd8974a3a78199fce94646950128", "tree": "e1c9e21525348fe826b91ecee7075ccb743f843d", "parents": [ "51b3ea2b8f7298bffbd246c65a606cd053357b66" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Apr 11 07:54:53 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 17:12:03 2014 +0000" }, "message": "warnings be gone.\n\n(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)\n\nModified by Mark Salyzyn \u003csalyzyn@google.com\u003e to keep merge conflicts\nor errors downstream to a minimum.\n\nChange-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613" }, { "commit": "12b44bd5fe3069cd3450d05b6c446b600e0553d3", "tree": "d7c3ff6a66a682520248b3b39e68a470968e3663", "parents": [ "51b3ea2b8f7298bffbd246c65a606cd053357b66" ], "author": { "name": "Zhongwei Yao", "email": "zhongwei.yao@arm.com", "time": "Thu Apr 10 17:23:42 2014 +0100" }, "committer": { "name": "Zheng Xu", "email": "zheng.xu@arm.com", "time": "Thu Apr 10 18:28:46 2014 +0100" }, "message": "AArch64: rewrite audioflinger\u0027s sinc resample by intrinsics.\n\nPass conformance test on armv7 and aarch64, performance test is done on armv7.\nCompared with original armv7 assembly version, this version has similar\nresult. Here is performance data on pandaboard android4.4 (input: random wave\nfile, unit: Mspl/s, toolchain:gcc 4.8):\n\n| | origin(assembly) | current(intrinsics) | C version |\n|----------------+------------------+---------------------+-----------|\n| single channel | 6.17 | 7.14 | 3.43 |\n| double channel | 5.24 | 5.63 | 3.50 |\n\nChange-Id: If5670218e1586e9dfd2b8d9c66a6880f3e4808ca\n" }, { "commit": "51b3ea2b8f7298bffbd246c65a606cd053357b66", "tree": "4f996c27cafd9ef29e45ba1f3acb05210fbd16e6", "parents": [ "93bbc8343133b910aeae536617efce978040bbae", "66fe2e9ee30bcb4161bc487ec63d2ae4a05f4051" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Apr 03 17:00:25 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Apr 03 17:00:25 2014 +0000" }, "message": "Merge \"64-bit: Correction to OMX_U32 and OMX_S32\"" }, { "commit": "93bbc8343133b910aeae536617efce978040bbae", "tree": "0645a0440cbb2f4bda446d3e073916c82d30e033", "parents": [ "2b2fbe299163b544668b41f594943a19b78dafd3", "08fce45fdb537e135868604522aba15461f516be" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Thu Apr 03 15:01:21 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Apr 03 15:01:22 2014 +0000" }, "message": "Merge \"Fix aac decoder flush\"" }, { "commit": "2b2fbe299163b544668b41f594943a19b78dafd3", "tree": "5982cad9d4ca213cf9f7dbbe5cbca3de1771aa1f", "parents": [ "4f53fe74051026e6635ba5bdbed4f1898cb66028", "c71a99131ca97bd3bdc5b78473d06e613e96e073" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Apr 02 21:38:17 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Apr 02 21:38:18 2014 +0000" }, "message": "Merge \"Fix decoder EOS handling\"" }, { "commit": "66fe2e9ee30bcb4161bc487ec63d2ae4a05f4051", "tree": "4f996c27cafd9ef29e45ba1f3acb05210fbd16e6", "parents": [ "08fce45fdb537e135868604522aba15461f516be" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Apr 02 10:25:35 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Apr 02 11:45:51 2014 -0700" }, "message": "64-bit: Correction to OMX_U32 and OMX_S32\n\nChange-Id: I9c41bb34c35595ac19a7ab8faaacde8cb4fa9a15\n" }, { "commit": "08fce45fdb537e135868604522aba15461f516be", "tree": "0645a0440cbb2f4bda446d3e073916c82d30e033", "parents": [ "c71a99131ca97bd3bdc5b78473d06e613e96e073" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Sep 20 07:18:21 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Apr 02 11:41:14 2014 -0700" }, "message": "Fix aac decoder flush\n\nb/8543366\n\nChange-Id: I746ffed6289486b802a2292bfc492ea6c780ed0b\n" }, { "commit": "c71a99131ca97bd3bdc5b78473d06e613e96e073", "tree": "5982cad9d4ca213cf9f7dbbe5cbca3de1771aa1f", "parents": [ "4f53fe74051026e6635ba5bdbed4f1898cb66028" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 29 09:31:26 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Apr 02 11:41:03 2014 -0700" }, "message": "Fix decoder EOS handling\n\nConceptually it should be the same whether EOS is signalled on the last\nbuffer holding data, or an empty buffer that follows. Make it so that\nthis actually behaves the same for mp3, AAC and Vorbis.\n\nb/8747869\n\nChange-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92\n" }, { "commit": "91820d46b5f3065c2fded3cdf65d305715b33bb1", "tree": "9099c90fc028d13f54e61a4147ff1f3e7f3a56b6", "parents": [ "1cc3f85de70e813998102bf572caad3691a6b6a2", "0370be96e33ea0c8fb4069e704deccce43b7403c" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Mar 25 19:08:01 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 25 19:08:01 2014 +0000" }, "message": "am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values\n\n* commit \u00270370be96e33ea0c8fb4069e704deccce43b7403c\u0027:\n DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values\n" }, { "commit": "1cc3f85de70e813998102bf572caad3691a6b6a2", "tree": "58d2dce7ce40bd51e3091b059c17b81eb9defc5d", "parents": [ "7b1524d4e866b53ab0d02a59cc6ccb133bd98f77", "4f53fe74051026e6635ba5bdbed4f1898cb66028" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Mar 25 18:25:13 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 25 18:25:13 2014 +0000" }, "message": "am 4f53fe74: Merge \"CameraService: deadlock fix\"\n\n* commit \u00274f53fe74051026e6635ba5bdbed4f1898cb66028\u0027:\n CameraService: deadlock fix\n" }, { "commit": "0370be96e33ea0c8fb4069e704deccce43b7403c", "tree": "9d244524a113db326aa9e86caab40c49a08248f3", "parents": [ "333ceb4f66ccf790081026f645474e07d832fbdb" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Mar 18 18:15:23 2014 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Mar 25 11:20:25 2014 -0700" }, "message": "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values\n\nAs a workaround, duplicate CameraParameters into CameraParameters2 to\nprevent ABI break for some camera HALs that directly link into\nCameraParameters.\n\nCameraParameters2 implements the real fixes needed in the framework,\nwhile CameraParameters is left in to satisfy older camera HALs.\n\nBug: 12609188\nChange-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da\n" }, { "commit": "4f53fe74051026e6635ba5bdbed4f1898cb66028", "tree": "f28808875e71939c1c9e0d30e69a283dac93b9db", "parents": [ "3d7c500234d98464d37ba3e1b65cea763b316b69", "6ec3a15257ca2b56b675a610aef43cc4ec6aaf00" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Mar 25 18:14:01 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 25 18:14:01 2014 +0000" }, "message": "Merge \"CameraService: deadlock fix\"" }, { "commit": "6ec3a15257ca2b56b675a610aef43cc4ec6aaf00", "tree": "f28808875e71939c1c9e0d30e69a283dac93b9db", "parents": [ "3d7c500234d98464d37ba3e1b65cea763b316b69" ], "author": { "name": "Kalle Lampila", "email": "kallex.lampila@intel.com", "time": "Tue Apr 30 15:27:19 2013 +0300" }, "committer": { "name": "Xiaokang Qin", "email": "xiaokang.qin@intel.com", "time": "Tue Mar 25 04:29:31 2014 -0700" }, "message": "CameraService: deadlock fix\n\nRelease lock before return from CameraService::dump()\n\nChange-Id: Ia20b0921fc675a284f3b7f8d26e0e3596b5a8774\nSigned-off-by: Kalle Lampila \u003ckallex.lampila@intel.com\u003e\n" }, { "commit": "7b1524d4e866b53ab0d02a59cc6ccb133bd98f77", "tree": "1a57a0a0e0f957a81cf71512d23dbe70ba06ca94", "parents": [ "0fcba89e5460ed3edca75322175b8a56a6e6f48d", "3d7c500234d98464d37ba3e1b65cea763b316b69" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 21 17:36:41 2014 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 21 17:36:41 2014 -0700" }, "message": "resolved conflicts for merge of 3d7c5002 to klp-dev-plus-aosp\n\nChange-Id: I19e1a26bd0226119c4fe2920bf6a09aaeff315d9\n" }, { "commit": "3d7c500234d98464d37ba3e1b65cea763b316b69", "tree": "c8c46021cf9d734226dc2c9f94111bc3d398c015", "parents": [ "24e1bd71ac6850d9062b3bd803b37c0e92f69c7a", "4bd71b4ed6f1825b287e448c336e3e59138c2956" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Sat Mar 22 00:23:15 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Mar 22 00:23:15 2014 +0000" }, "message": "Merge changes I9f28bc42,I135620e0\n\n* changes:\n libcameraservice: build 64-bit\n libcameraservice: fix 64-bit print format warnings\n" }, { "commit": "4bd71b4ed6f1825b287e448c336e3e59138c2956", "tree": "c8c46021cf9d734226dc2c9f94111bc3d398c015", "parents": [ "e5729fac81c8a984e984fefc90afc64135817d4f" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 21 15:09:19 2014 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 21 15:09:19 2014 -0700" }, "message": "libcameraservice: build 64-bit\n\nlibcameraservice builds fine for 64-bit, remove LOCAL_32_BIT_ONLY\n\nChange-Id: I9f28bc42dc424dee9b92e6ab092f86d3aa1419b7\n" }, { "commit": "e5729fac81c8a984e984fefc90afc64135817d4f", "tree": "526e94e71d66a2cf8faac48c16716bf3c757a2a6", "parents": [ "24e1bd71ac6850d9062b3bd803b37c0e92f69c7a" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 21 15:04:25 2014 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 21 15:04:25 2014 -0700" }, "message": "libcameraservice: fix 64-bit print format warnings\n\nUse PRId64 from inttypes.h to print nsecs_t (int64_t)\nUse %zu to print size_t\n\nChange-Id: I135620e0388db33587a8a7da393b48a45cb7275a\n" }, { "commit": "0fcba89e5460ed3edca75322175b8a56a6e6f48d", "tree": "d20dd7448d2f0bfb6bbac56fbdc5a96a01b01599", "parents": [ "5ce204a6362840fe28aa762693edaab3d0da8718", "333ceb4f66ccf790081026f645474e07d832fbdb" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 21 19:20:07 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 21 19:20:07 2014 +0000" }, "message": "am 333ceb4f: Merge \"DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.\" into klp-dev\n\n* commit \u0027333ceb4f66ccf790081026f645474e07d832fbdb\u0027:\n DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.\n" }, { "commit": "333ceb4f66ccf790081026f645474e07d832fbdb", "tree": "b010fd0eb1520d19debd1e90a9a8d71bd0a833a8", "parents": [ "f622e2c78407b50806a53a06a89b2b6546420f55", "65e20ffc984c541a8119420f917493dd7b703f77" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 21 19:09:48 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 21 19:09:49 2014 +0000" }, "message": "Merge \"DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.\" into klp-dev" }, { "commit": "65e20ffc984c541a8119420f917493dd7b703f77", "tree": "15d1d92e6b53cd32b1e7036359fe58841ff2d0d1", "parents": [ "a577eefbaca24d1b9ac947daca54be1992888748" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Feb 07 12:26:58 2014 -0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Mar 21 19:05:17 2014 +0000" }, "message": "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.\n\nFirst check for embedded ID3 tag, then bail out if invalid.\n\nBug: 12934795\nChange-Id: I74acebed4bfb2c6ca44dfe936166fdba8510233f" }, { "commit": "5ce204a6362840fe28aa762693edaab3d0da8718", "tree": "4cb3aaf62d5b5842be911f223bd51ebc1014b540", "parents": [ "762f533c825040ae0d953783584f778ec187fec5", "f622e2c78407b50806a53a06a89b2b6546420f55" ], "author": { "name": "Rachad", "email": "rachad@google.com", "time": "Fri Mar 21 17:08:50 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 21 17:08:50 2014 +0000" }, "message": "am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)\n\n* commit \u0027f622e2c78407b50806a53a06a89b2b6546420f55\u0027:\n Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)\n" }, { "commit": "f622e2c78407b50806a53a06a89b2b6546420f55", "tree": "0a4e6bc97cccf6a40d76ef15e88e1a62b8a6e3b5", "parents": [ "a577eefbaca24d1b9ac947daca54be1992888748" ], "author": { "name": "Rachad", "email": "rachad@google.com", "time": "Mon Feb 10 16:54:46 2014 -0800" }, "committer": { "name": "Vineeta Srivastava", "email": "vsrivastava@google.com", "time": "Fri Mar 21 16:36:35 2014 +0000" }, "message": "Increased recorded MP4 max file size to 4GB\n(more precisely 2^32-1 bytes -- FAT32 max file size)\n\nbug: 11039801\nChange-Id: I6169f798c59d123d02d5fd7afa3b9e645ebdb598\n(cherry picked from commit 1f1f2b1678fd0d038dfc501252dd2b65ecf10cae)\n" }, { "commit": "762f533c825040ae0d953783584f778ec187fec5", "tree": "5b60ebe1a0a691c36961e15510575fc401807445", "parents": [ "762108211026d46cf277d1585cf770170932e3f2", "a577eefbaca24d1b9ac947daca54be1992888748" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 20:56:51 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 20:56:51 2014 +0000" }, "message": "am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build\n\n* commit \u0027a577eefbaca24d1b9ac947daca54be1992888748\u0027:\n Fix build\n" }, { "commit": "a577eefbaca24d1b9ac947daca54be1992888748", "tree": "4abecebedcd012d86fbafc1ec822f36ac13c7cd4", "parents": [ "2853e48c855fc95f2bd7bf9438a878f2a79d75a7", "5be9c1daf956c35d37585d21fff5d6b99f506560" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 20:48:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 20:48:52 2014 +0000" }, "message": "am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build\n\n* commit \u00275be9c1daf956c35d37585d21fff5d6b99f506560\u0027:\n Fix build\n" }, { "commit": "5be9c1daf956c35d37585d21fff5d6b99f506560", "tree": "ae3cbacd3b548cc7e3b2c4fbc3e8c90d45d2b7df", "parents": [ "6f65db14e310b513c8943b236a6e61cf27cef4c7", "01eed3c0fb951e349d68f4bce818bef22e7925b1" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 13:29:33 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 13:29:33 2014 -0700" }, "message": "am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build\n\n* commit \u002701eed3c0fb951e349d68f4bce818bef22e7925b1\u0027:\n Fix build\n" }, { "commit": "01eed3c0fb951e349d68f4bce818bef22e7925b1", "tree": "f8ab5f1808ea539cfc77d41ddfb3a62be80f9921", "parents": [ "0e0891f8b49f31e6a28b563f86aae537e66bb6e0", "7a107b857e658ba11c0c1fd2325ac91a2c0569a2" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 13:18:07 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 13:18:07 2014 -0700" }, "message": "am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build\n\n* commit \u00277a107b857e658ba11c0c1fd2325ac91a2c0569a2\u0027:\n Fix build\n" }, { "commit": "7a107b857e658ba11c0c1fd2325ac91a2c0569a2", "tree": "c343516caf66fb2a665705f8520c7a4e2c054688", "parents": [ "6cdc90b5e41374dd665df3ae7283ef0c1f532678", "854aa061b1e2d7eaaf8ffa2ead323c1478393c57" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 13:13:35 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 13:13:35 2014 -0700" }, "message": "am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build\n\n* commit \u0027854aa061b1e2d7eaaf8ffa2ead323c1478393c57\u0027:\n Fix build\n" }, { "commit": "854aa061b1e2d7eaaf8ffa2ead323c1478393c57", "tree": "4dbc152a7a07fd040cd3851ad9816d2d9cceff5b", "parents": [ "ebc9b47330ab8565f7bdd9b3973a8f75e3206e77", "42ba5806c03753a39f85016265173819ac465745" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 13:08:17 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 13:08:17 2014 -0700" }, "message": "am 42ba5806: am 72499628: am 25bab830: Fix build\n\n* commit \u002742ba5806c03753a39f85016265173819ac465745\u0027:\n Fix build\n" }, { "commit": "42ba5806c03753a39f85016265173819ac465745", "tree": "80b7de0359644cc3b961bc848460e6dcbd2cf939", "parents": [ "fb49b8bad468db591f55a7064181372f02ad94a2", "72499628a24ccea0befe726de6e2b32176ddf208" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 13:04:11 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 13:04:11 2014 -0700" }, "message": "am 72499628: am 25bab830: Fix build\n\n* commit \u002772499628a24ccea0befe726de6e2b32176ddf208\u0027:\n Fix build\n" }, { "commit": "72499628a24ccea0befe726de6e2b32176ddf208", "tree": "80b7de0359644cc3b961bc848460e6dcbd2cf939", "parents": [ "dfd90c8052a913ed2bbbea1873ee51838d40bfe1", "25bab830af062dcaef6f75220066b221fd30957e" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 13:00:07 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 13:00:07 2014 -0700" }, "message": "am 25bab830: Fix build\n\n* commit \u002725bab830af062dcaef6f75220066b221fd30957e\u0027:\n Fix build\n" }, { "commit": "25bab830af062dcaef6f75220066b221fd30957e", "tree": "3d4b7cc83a843df86fab1080596eddb13016cff6", "parents": [ "d434944b00cf83a38019047e0d7db155a15d77f4" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 12:32:48 2014 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 12:32:48 2014 -0700" }, "message": "Fix build\n\nAs of jb-mr1, need to explicitly include library dependencies. The original\nchange in jb, which the automerger dutyfully merged, did not need this.\n\nChange-Id: I429637e2d01b8084376bb97a02bb091a0ea9eaf7\n" }, { "commit": "762108211026d46cf277d1585cf770170932e3f2", "tree": "d952bd8aa8f6c8e5a20dcbfafc667dfb7a65079b", "parents": [ "181cd2ba90ab574da7b57a0b79e3e2118b6ea3ad", "2853e48c855fc95f2bd7bf9438a878f2a79d75a7" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 18:59:48 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 18:59:48 2014 +0000" }, "message": "am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u00272853e48c855fc95f2bd7bf9438a878f2a79d75a7\u0027:\n Verify certificates\n" }, { "commit": "2853e48c855fc95f2bd7bf9438a878f2a79d75a7", "tree": "6dfa3c77406b420f582e0cfc9f42d7f848314d7c", "parents": [ "1faa41704e0b976e546321effcb09a85767d51ba", "6f65db14e310b513c8943b236a6e61cf27cef4c7" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 18:17:24 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 18:17:24 2014 +0000" }, "message": "am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u00276f65db14e310b513c8943b236a6e61cf27cef4c7\u0027:\n Verify certificates\n" }, { "commit": "6f65db14e310b513c8943b236a6e61cf27cef4c7", "tree": "2a04fb4a673c20e6ffb26af36c886ef2e8d730ee", "parents": [ "27ae268af29b25d85f83aa34e92ac8b7f6c87c6f", "0e0891f8b49f31e6a28b563f86aae537e66bb6e0" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 11:08:43 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 11:08:43 2014 -0700" }, "message": "am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u00270e0891f8b49f31e6a28b563f86aae537e66bb6e0\u0027:\n Verify certificates\n" }, { "commit": "0e0891f8b49f31e6a28b563f86aae537e66bb6e0", "tree": "e362e6c968f6db985c142e31744ffc61ad301d17", "parents": [ "00cb884fc870aba4052c8d187a45e4aec50a6b43", "6cdc90b5e41374dd665df3ae7283ef0c1f532678" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:49:15 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:49:15 2014 -0700" }, "message": "am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u00276cdc90b5e41374dd665df3ae7283ef0c1f532678\u0027:\n Verify certificates\n" }, { "commit": "6cdc90b5e41374dd665df3ae7283ef0c1f532678", "tree": "203fce295e8441957dc42d56c8358e622a1a157a", "parents": [ "31d49615007372621ac3fba55e9e3aab48c873f9", "ebc9b47330ab8565f7bdd9b3973a8f75e3206e77" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:31:32 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:31:32 2014 -0700" }, "message": "am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u0027ebc9b47330ab8565f7bdd9b3973a8f75e3206e77\u0027:\n Verify certificates\n" }, { "commit": "ebc9b47330ab8565f7bdd9b3973a8f75e3206e77", "tree": "a79d6dddf8862a80408905f7e24741632376f9df", "parents": [ "27b876d4cf78b262854b9f2aec26467f9323d3ad", "fb49b8bad468db591f55a7064181372f02ad94a2" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:27:04 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:27:04 2014 -0700" }, "message": "am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u0027fb49b8bad468db591f55a7064181372f02ad94a2\u0027:\n Verify certificates\n" }, { "commit": "fb49b8bad468db591f55a7064181372f02ad94a2", "tree": "61b9f60e8d12c6d5d2891dc5055af49aa00f3bc6", "parents": [ "9bc40a2cfdd307074ef5c23ad444fc8a782bab84", "dfd90c8052a913ed2bbbea1873ee51838d40bfe1" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:21:14 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:21:14 2014 -0700" }, "message": "am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u0027dfd90c8052a913ed2bbbea1873ee51838d40bfe1\u0027:\n Verify certificates\n" }, { "commit": "dfd90c8052a913ed2bbbea1873ee51838d40bfe1", "tree": "61b9f60e8d12c6d5d2891dc5055af49aa00f3bc6", "parents": [ "98603acbce87c3a451c8e4c26625048363c3f7f7", "d434944b00cf83a38019047e0d7db155a15d77f4" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:16:53 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:16:53 2014 -0700" }, "message": "am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u0027d434944b00cf83a38019047e0d7db155a15d77f4\u0027:\n Verify certificates\n" }, { "commit": "d434944b00cf83a38019047e0d7db155a15d77f4", "tree": "ad223a08bff12a7cf83dc4804af6cba9abb6d6cd", "parents": [ "36337f8f1c4d7384cb1528205582148c85c69f4d", "3bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:11:20 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:11:20 2014 -0700" }, "message": "am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u00273bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed\u0027:\n Verify certificates\n" }, { "commit": "3bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed", "tree": "474128b1314cd7deee61dac6997d68a22d5f2a22", "parents": [ "7d72965ff6a4bf9f91213fbdafcd12cfad8334e5", "0c271b750f7314e187f8479f478ad9382d9a9045" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:04:18 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:04:18 2014 -0700" }, "message": "am 0c271b75: Verify certificates\n\n* commit \u00270c271b750f7314e187f8479f478ad9382d9a9045\u0027:\n Verify certificates\n" }, { "commit": "181cd2ba90ab574da7b57a0b79e3e2118b6ea3ad", "tree": "37ef0f2e9d087ad6fbfd60ea8fd18f4db85d05a9", "parents": [ "eae4e2ee8ee652e658a46bdfb56b055385a9f033", "24e1bd71ac6850d9062b3bd803b37c0e92f69c7a" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 21:05:33 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 19 21:05:33 2014 +0000" }, "message": "am 24e1bd71: Merge \"libstagefright is no longer 32 bit only.\"\n\n* commit \u002724e1bd71ac6850d9062b3bd803b37c0e92f69c7a\u0027:\n libstagefright is no longer 32 bit only.\n" }, { "commit": "24e1bd71ac6850d9062b3bd803b37c0e92f69c7a", "tree": "f21e4aadfd709d10588a17faf9b296258587e137", "parents": [ "bd7bde794c587dc9443c22abd3bcaa78fd804615", "f3aa039a2278f789e3c9d5e18b83f9d937a05a5f" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 20:58:48 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 19 20:58:48 2014 +0000" }, "message": "Merge \"libstagefright is no longer 32 bit only.\"" }, { "commit": "eae4e2ee8ee652e658a46bdfb56b055385a9f033", "tree": "8d4ba98c60d32bd0e020cc6656d3369872f1fe43", "parents": [ "d09ec3b22013ef43d422c916dfd44bab9101a659", "bd7bde794c587dc9443c22abd3bcaa78fd804615" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 20:37:28 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 19 20:37:28 2014 +0000" }, "message": "am bd7bde79: Merge \"Use libaudioresampler instead of libaudioflinger\"\n\n* commit \u0027bd7bde794c587dc9443c22abd3bcaa78fd804615\u0027:\n Use libaudioresampler instead of libaudioflinger\n" }, { "commit": "bd7bde794c587dc9443c22abd3bcaa78fd804615", "tree": "756052e8b34fe18b5b90f7cb53f03409de37ccb6", "parents": [ "36817364738d4c45adc3e448fbec02a9611bfeda", "4269fc8068d10fc95780e8a7e1e4d4eb43483883" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 20:29:11 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 19 20:29:12 2014 +0000" }, "message": "Merge \"Use libaudioresampler instead of libaudioflinger\"" }, { "commit": "d09ec3b22013ef43d422c916dfd44bab9101a659", "tree": "ded7eec70094a054406b39d7d4a89dd3007cd115", "parents": [ "f4d9d45ebad478091d65b2a4c18544d308d3fff0", "36817364738d4c45adc3e448fbec02a9611bfeda" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 19:56:17 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 19 19:56:17 2014 +0000" }, "message": "am 36817364: Merge \"Add libaudioresampler\"\n\n* commit \u002736817364738d4c45adc3e448fbec02a9611bfeda\u0027:\n Add libaudioresampler\n" }, { "commit": "f4d9d45ebad478091d65b2a4c18544d308d3fff0", "tree": "2ac6ef3ce00d28d42f0c8262c83b7c5e4e3eec9f", "parents": [ "4647dba9afd0b365e47b9493a680d71b59a361e6", "1faa41704e0b976e546321effcb09a85767d51ba" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Mar 19 19:56:11 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 19 19:56:11 2014 +0000" }, "message": "am 1faa4170: stagefright: allow for minUndequeuedBufs to be one less\n\n* commit \u00271faa41704e0b976e546321effcb09a85767d51ba\u0027:\n stagefright: allow for minUndequeuedBufs to be one less\n" }, { "commit": "36817364738d4c45adc3e448fbec02a9611bfeda", "tree": "a1f2797399f967b46ec2d823f6f520f5b8426684", "parents": [ "b2ecad7f079f4f852d334e67fd7a72ff1696a78e", "ddf887c08b58382920effb7f0b2049e471960b4a" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 19:45:28 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 19 19:45:29 2014 +0000" }, "message": "Merge \"Add libaudioresampler\"" }, { "commit": "1faa41704e0b976e546321effcb09a85767d51ba", "tree": "64966380d3e178c4092670de4b11d0a43114b221", "parents": [ "b635b0e66b257ab442e230bca96afd5105cf6829" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Mar 19 12:22:01 2014 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Mar 19 12:39:53 2014 -0700" }, "message": "stagefright: allow for minUndequeuedBufs to be one less\n\nBug: 13533477\nChange-Id: I909324e3e24f65d8051e0d5474267620efcfc729\n" }, { "commit": "f3aa039a2278f789e3c9d5e18b83f9d937a05a5f", "tree": "f21e4aadfd709d10588a17faf9b296258587e137", "parents": [ "4269fc8068d10fc95780e8a7e1e4d4eb43483883" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Mar 19 09:07:30 2014 -0700" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Mar 19 18:01:17 2014 +0000" }, "message": "libstagefright is no longer 32 bit only.\n\nChange-Id: I88d5fcfc005a2c2acd0246cdd9c08b6c00b6c39b\nSigned-off-by: Glenn Kasten \u003cgkasten@android.com\u003e" }, { "commit": "4269fc8068d10fc95780e8a7e1e4d4eb43483883", "tree": "756052e8b34fe18b5b90f7cb53f03409de37ccb6", "parents": [ "ddf887c08b58382920effb7f0b2049e471960b4a" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 09:05:59 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 10:55:00 2014 -0700" }, "message": "Use libaudioresampler instead of libaudioflinger\n\nin order to be able to build libvideoeditor as 64-bit also.\n\nlibaudioresampler is available in both 32-bit and 64-bit,\nunlike libaudioflinger which is currently 32-bit only.\n\nChange-Id: Id63857da877b1e45b7c1f8e35f18dca6600be3f7\n" }, { "commit": "ddf887c08b58382920effb7f0b2049e471960b4a", "tree": "a1f2797399f967b46ec2d823f6f520f5b8426684", "parents": [ "b2ecad7f079f4f852d334e67fd7a72ff1696a78e" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 09:05:08 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 10:53:13 2014 -0700" }, "message": "Add libaudioresampler\n\nlibaudioresampler is available in both 32-bit and 64-bit,\nunlike libaudioflinger which is currently 32-bit only.\n\nBug: 8141282\nChange-Id: I839f7b4e6aaed6984012ca6d514323f927669df6\n" }, { "commit": "0c271b750f7314e187f8479f478ad9382d9a9045", "tree": "6a605bc71ee0e29300f0acf8494d983473a92207", "parents": [ "6047633622328711cc6b23667c8d6381bae179bf" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 13 14:18:25 2014 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Mar 19 09:58:37 2014 -0700" }, "message": "Verify certificates\n\nb/13418320\n\nCherrypicked from 8a57d24c733b08da846b54d1adf029e606b5a5f3\nhttps://googleplex-android-review.git.corp.google.com/#/c/433309/\n\nChange-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b\n" }, { "commit": "4647dba9afd0b365e47b9493a680d71b59a361e6", "tree": "fc4b0f24a04a7a84d487ee144844ad312e201001", "parents": [ "28c3e94a9b02bd5d5ed4b5fe96dff74700f88677", "b635b0e66b257ab442e230bca96afd5105cf6829" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Mar 19 03:10:40 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 19 03:10:40 2014 +0000" }, "message": "am b635b0e6: mediaplayer: keep more buffers with the BufferQueue\n\n* commit \u0027b635b0e66b257ab442e230bca96afd5105cf6829\u0027:\n mediaplayer: keep more buffers with the BufferQueue\n" }, { "commit": "28c3e94a9b02bd5d5ed4b5fe96dff74700f88677", "tree": "151c3356429f490d2b0ff7e204e1ab5c4ba9b413", "parents": [ "a933aa34f95ca54a765a2a3f2ef245b7054aef16", "43ca783effd99bba0e6e2dd6fe177a8888578ef8" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Mar 19 02:19:41 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 19 02:19:41 2014 +0000" }, "message": "am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.\n\n* commit \u002743ca783effd99bba0e6e2dd6fe177a8888578ef8\u0027:\n httplive: block-by-block fetch, decrypt, and parse ts files.\n" }, { "commit": "b635b0e66b257ab442e230bca96afd5105cf6829", "tree": "ce27a9ac30a219e6895cffddd6c4f9ab873ca19a", "parents": [ "43ca783effd99bba0e6e2dd6fe177a8888578ef8" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Feb 13 15:29:49 2014 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Mar 19 02:15:24 2014 +0000" }, "message": "mediaplayer: keep more buffers with the BufferQueue\n\nChange OMX buffer allocation policy to allocate\nnBufferCountMin + what is required for the BQ.\n\nFor the BQ, try to allocate 2 additional buffers than\nthe minimum undequeued count.\n\nAlso account for the fact that BQ may return one less\nthan the actual minimum undequeued count.\n\nIn most cases the resulting number of buffers ends up\nbeing the same as with the previous policy, but we\nkeep more buffers with the BQ.\n\nChange-Id: I826db8bf7dd333b620299dba60bf1b81b228275d\nBug: 13170236" }, { "commit": "43ca783effd99bba0e6e2dd6fe177a8888578ef8", "tree": "943ef354f3544d932b978b977f4525af65d9fa5b", "parents": [ "bd3e2e03f3ab686c52982a9e50cae853128172cf" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Feb 27 12:33:24 2014 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Mar 19 02:09:58 2014 +0000" }, "message": "httplive: block-by-block fetch, decrypt, and parse ts files.\n\nBug: 12060952\nChange-Id: I695345081fe23961b9d0ef6db264885f914703ec" }, { "commit": "a933aa34f95ca54a765a2a3f2ef245b7054aef16", "tree": "25b8ec6309e053f6a10f9a7e40563028cd97bcb9", "parents": [ "d8590167fec151cc2e8f6e28e406c99882f40884", "b2ecad7f079f4f852d334e67fd7a72ff1696a78e" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Mar 18 23:29:58 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 18 23:29:58 2014 +0000" }, "message": "am b2ecad7f: Merge \"libstagefright_foundation: fix printf format for 64-bit\"\n\n* commit \u0027b2ecad7f079f4f852d334e67fd7a72ff1696a78e\u0027:\n libstagefright_foundation: fix printf format for 64-bit\n" }, { "commit": "b2ecad7f079f4f852d334e67fd7a72ff1696a78e", "tree": "d2b91f9af4242f913673ceb1b42105ed820ac3b4", "parents": [ "77658a069c81a0d5b4a1b81443b470a3ea64cab0", "67c036a3faada8b77d73cf81bd1b0be4cb60c562" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Mar 18 23:20:52 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 23:20:52 2014 +0000" }, "message": "Merge \"libstagefright_foundation: fix printf format for 64-bit\"" }, { "commit": "67c036a3faada8b77d73cf81bd1b0be4cb60c562", "tree": "d2b91f9af4242f913673ceb1b42105ed820ac3b4", "parents": [ "77658a069c81a0d5b4a1b81443b470a3ea64cab0" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Mar 18 16:18:27 2014 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Mar 18 16:18:27 2014 -0700" }, "message": "libstagefright_foundation: fix printf format for 64-bit\n\nFixes build error:\nframeworks/av/media/libstagefright/foundation/ANetworkSession.cpp:582:131: error: format \u0027%d\u0027 expects argument of type \u0027int\u0027, but argument 4 has type \u0027size_t {aka long unsigned int}\u0027 [-Werror\u003dformat\u003d]\n ALOGI(\"%d datagrams remain queued.\", mOutFragments.size());\n ^\ncc1plus: all warnings being treated as errors\n\nChange-Id: I69d1f086b8f1e450f107671c8f8f3ed696d170b4\n" }, { "commit": "d8590167fec151cc2e8f6e28e406c99882f40884", "tree": "6d266adb3ec0e7c1337eed3115005a67a72861b2", "parents": [ "3327597fe780a076a0755c7a4f1aff895c531dad", "77658a069c81a0d5b4a1b81443b470a3ea64cab0" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Tue Mar 18 17:41:42 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 18 17:41:42 2014 +0000" }, "message": "am 77658a06: Merge \"AudioPolicyService: malloc/delete pair\"\n\n* commit \u002777658a069c81a0d5b4a1b81443b470a3ea64cab0\u0027:\n AudioPolicyService: malloc/delete pair\n" }, { "commit": "77658a069c81a0d5b4a1b81443b470a3ea64cab0", "tree": "3e08958e7ac8f848823003064713cb731a05b5e9", "parents": [ "64727dd7c8513b6c9ddcce2f4b305618bb76121c", "db358afc965d9bfb703953ac004275428a7cda64" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Tue Mar 18 17:31:25 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 17:31:26 2014 +0000" }, "message": "Merge \"AudioPolicyService: malloc/delete pair\"" }, { "commit": "3327597fe780a076a0755c7a4f1aff895c531dad", "tree": "aa1b9dd5da246ee27deb2ee0fa58f48e3ce8aa9c", "parents": [ "63143ee8a0a59d73655c8eac715ae7321027fa2b", "64727dd7c8513b6c9ddcce2f4b305618bb76121c" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Tue Mar 18 17:22:07 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 18 17:22:07 2014 +0000" }, "message": "am 64727dd7: Merge \"More precise 32-bit only for libstagefright/ subdirectories\"\n\n* commit \u002764727dd7c8513b6c9ddcce2f4b305618bb76121c\u0027:\n More precise 32-bit only for libstagefright/ subdirectories\n" }, { "commit": "64727dd7c8513b6c9ddcce2f4b305618bb76121c", "tree": "5ac6b17e738c4157c1a79ae385fb1d924623cdfb", "parents": [ "0e7e5db7a0e70fd90fc61133b6a109c85eab29bf", "dc2b47aee47ad8690fd8dc663c6602b7efa3bbac" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Tue Mar 18 17:13:23 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 17:13:24 2014 +0000" }, "message": "Merge \"More precise 32-bit only for libstagefright/ subdirectories\"" }, { "commit": "63143ee8a0a59d73655c8eac715ae7321027fa2b", "tree": "4be615d3440a5c7dc14c99df7164ac89534cea48", "parents": [ "6f62a68d69e22201a2c44b2663c8dc71fe17f0b5", "bd3e2e03f3ab686c52982a9e50cae853128172cf" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 17 22:55:38 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 17 22:55:38 2014 +0000" }, "message": "am bd3e2e03: camera2: Fix segfault when using null availability listener\n\n* commit \u0027bd3e2e03f3ab686c52982a9e50cae853128172cf\u0027:\n camera2: Fix segfault when using null availability listener\n" }, { "commit": "bd3e2e03f3ab686c52982a9e50cae853128172cf", "tree": "08e6182c089c0377db4b5c0010b30a16d8f2e5ba", "parents": [ "75dcf5101c90e31bbac95694d835b0e8f57ba720" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 17 13:01:41 2014 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Mar 17 13:01:41 2014 -0700" }, "message": "camera2: Fix segfault when using null availability listener\n\nICameraService::addListener / removeListener will now return BAD_VALUE\nif a null listener is used.\n\nBug: 12891434\nChange-Id: I9764110094d8fd42e22fcc8df3ef0e73c1b070e7\n" }, { "commit": "dc2b47aee47ad8690fd8dc663c6602b7efa3bbac", "tree": "5ac6b17e738c4157c1a79ae385fb1d924623cdfb", "parents": [ "0e7e5db7a0e70fd90fc61133b6a109c85eab29bf" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Mon Mar 17 11:49:35 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Mon Mar 17 11:50:07 2014 -0700" }, "message": "More precise 32-bit only for libstagefright/ subdirectories\n\nChange-Id: Ie4e8f9ccd834b902287d3452cc9fa739809ddb68\n" }, { "commit": "6f62a68d69e22201a2c44b2663c8dc71fe17f0b5", "tree": "de2a3fc046b7f9aa38d6cf30a97e72e92fdc0bf3", "parents": [ "a58ed6d8378108e4309ee0077dc4529b76634791", "0e7e5db7a0e70fd90fc61133b6a109c85eab29bf" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Mon Mar 17 18:43:03 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 17 18:43:03 2014 +0000" }, "message": "am 0e7e5db7: Merge \"More 32-bit only\"\n\n* commit \u00270e7e5db7a0e70fd90fc61133b6a109c85eab29bf\u0027:\n More 32-bit only\n" } ], "next": "0e7e5db7a0e70fd90fc61133b6a109c85eab29bf" }