)]}'
{
  "log": [
    {
      "commit": "460b7e88f1e7d13e934c9596fbd799c39e63d788",
      "tree": "487c5050e8fd189f2d80cac9fb6161d9fde94180",
      "parents": [
        "f7f08afc8be3160299a3afc2fa96d7ed7d6dbf8d"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Mon Dec 19 14:06:30 2016 -0800"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Mon Dec 19 14:06:30 2016 -0800"
      },
      "message": "Fix issues with extractor dumpsys\n\nTracks and descriptions were added to their respective lists in\nopposite order, so dumpsys could mix up the format and active\nstate for a given track. Also fix potential NULL pointer dereference.\n\nBug: 33179012\nChange-Id: I700d535da0e72f5641bf9257a34fdb5d5d068b12\n"
    },
    {
      "commit": "c12499d5c646e79d6a91dddc44c79921d9967c8e",
      "tree": "450a96a37c2cc4ea456ad8aae9ca119457691547",
      "parents": [
        "c7ad5838d2aec7ff90db36069f3577d3c4feaa95",
        "955e85294dfff70ae7f4afff28ab408e6eb981ed"
      ],
      "author": {
        "name": "Caroline Tice",
        "email": "cmtice@google.com",
        "time": "Wed Nov 23 04:24:30 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Nov 23 04:24:30 2016 +0000"
      },
      "message": "Merge \"Fix null-pointer derefernce warning.\"\nam: 955e85294d\n\nChange-Id: I492db6e2ea9cbe052f4120aba3477052ad791a29\n"
    },
    {
      "commit": "225fc6958d6d9981b3f6884109ccf13fe459057c",
      "tree": "b13255edf6b002153e40030bba481fb41e16c286",
      "parents": [
        "11f51b046344c8e14ef764d755cae697f6bce4e8"
      ],
      "author": {
        "name": "Caroline Tice",
        "email": "cmtice@google.com",
        "time": "Tue Nov 15 18:03:48 2016 -0800"
      },
      "committer": {
        "name": "George Burgess IV",
        "email": "gbiv@google.com",
        "time": "Tue Nov 15 18:03:48 2016 -0800"
      },
      "message": "Fix null-pointer derefernce warning.\n\nFixes IOMX.cpp:599  warning: Dereference of null pointer\n\nBUG: None\nTest: Warning is now gone.\nChange-Id: Ife4a8d8af9b2eccd020448ac2ad4c65de081eb4c\n"
    },
    {
      "commit": "4ea929819e23ecd388e1edce25a10631ee53e9e3",
      "tree": "23738cbafefdd9f9dcc839a01525533e0045c554",
      "parents": [
        "5c4ca88476ea3c26b88fc13c281db9eb20913511",
        "795a2a75542d25eefa56bebc388340ee15fdff5c"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Mon Nov 07 17:21:49 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Nov 07 17:21:49 2016 +0000"
      },
      "message": "Split libmedia into libmedia and libaudioclient\nam: 795a2a7554\n\nChange-Id: Ic08eddc5650d3f5d344ebcf93ad98ae5bb236c8c\n"
    },
    {
      "commit": "795a2a75542d25eefa56bebc388340ee15fdff5c",
      "tree": "5b595a348342c3ad28549329ba5653ad62db75d1",
      "parents": [
        "bf26c4eb629b514648420916fd1db40333c30ea5"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Wed Nov 02 13:21:22 2016 -0700"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Nov 04 19:31:54 2016 -0700"
      },
      "message": "Split libmedia into libmedia and libaudioclient\n\nThis makes it so audioserver doesn\u0027t need to link against the entire libmedia,\nwhich has dependencies on camera, ICU, OpenGL and other things that aren\u0027t\nneeded for audio.\n\nTest: build/boot\n\nChange-Id: I99ba1a3dc3b33ca9b3abd98e7519dbf228ee62af\n"
    },
    {
      "commit": "ad43cf3a8b3e52bda741b5759813dedfcc0e19d3",
      "tree": "afc0e70070ea040db26304352fa5abc0c6d8503c",
      "parents": [
        "cd1dad10b5e5d0d326130e471d0f89f398975a17",
        "12dc4449ee3c9a51407d13eaaf5d8a61b2d9c5ba"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Sat Nov 05 00:02:25 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sat Nov 05 00:02:25 2016 +0000"
      },
      "message": "Merge \"Move IMediaLogService to libmedialogservice\"\nam: 12dc4449ee\n\nChange-Id: I78dd9164b47538205fbed6fe04fafb8bbcc55009\n"
    },
    {
      "commit": "4f197ec220d2c9634429692dd37896233273111d",
      "tree": "9ee3410c97a0375f18e05a0728643cfe587f0edc",
      "parents": [
        "68f9d0dc3b25c69eecccc9487319dd3343f0790b",
        "46d0a5b493dc7ef8cfd068c1b12d1d47d03d7884"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Nov 04 22:52:20 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Nov 04 22:52:20 2016 +0000"
      },
      "message": "Merge \"Remove unneeded links with dynamic libraries\"\nam: 46d0a5b493\n\nChange-Id: Ica6dd538c30b9aeccddad229cb24ade4d82d2e4c\n"
    },
    {
      "commit": "4b21bd2dac2727531aad1e74079b4d34077524a0",
      "tree": "af0d052ddb01e0cbb25ae07b87dd8d96ee2ff870",
      "parents": [
        "f48f36ebe0415d340770f0ef73ce3967779fadf0"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Wed Nov 02 09:59:52 2016 -0700"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Nov 04 14:37:17 2016 -0700"
      },
      "message": "Move IMediaLogService to libmedialogservice\n\nSo audioserver and libmedialogservice don\u0027t have to link against libmedia\n\nTest: build/boot\nChange-Id: I4040d9f6db59807c3fa56321d45fb6ab50fb5edb\n"
    },
    {
      "commit": "263506542fbe480ddb247597bdcef16c437b48dd",
      "tree": "1ad06b1495a50534199f1aa5068b8519dd5d50c5",
      "parents": [
        "712690b37495816a3f55e2d000f1f68caf1c20a4"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Tue Oct 25 13:17:47 2016 -0700"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Nov 04 14:17:07 2016 -0700"
      },
      "message": "Remove unneeded links with dynamic libraries\n\nVarious media components were linking against dynamic libraries that weren\u0027t needed.\n\nTest: built and booted\n\nChange-Id: I7379506fd06d4e28e0eff0001fd073a2d3860f8e\n"
    },
    {
      "commit": "c31b3b7d3b666fb19c87e022b590d695ca16042d",
      "tree": "ce9ea3e38817086550bfec1344484fe9d5f20fee",
      "parents": [
        "fbed6401879f4d94f3250d715ce542d62ba362f8",
        "c2aef83febfafc8e64c183c342625e9d4e4999be"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Oct 13 23:28:34 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Oct 13 23:28:34 2016 +0000"
      },
      "message": "Fix divide by zero am: 0d13824315\nam: c2aef83feb\n\nChange-Id: Ib94af4f98542dd11b4f41231031bea2954fb04e2\n"
    },
    {
      "commit": "c2aef83febfafc8e64c183c342625e9d4e4999be",
      "tree": "37ba0e25426452e995ac38307672a6d8714c6d27",
      "parents": [
        "2e6f0631b0b88f5d92ec9aec8b89f494ddc09e77",
        "0d13824315b0491d44e9c6eb5db06489ab0fcc20"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Oct 13 23:25:46 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Oct 13 23:25:46 2016 +0000"
      },
      "message": "Fix divide by zero\nam: 0d13824315\n\nChange-Id: Ic1a3c8e78999c268a330505e92835d8c4733cbf9\n"
    },
    {
      "commit": "0d13824315b0491d44e9c6eb5db06489ab0fcc20",
      "tree": "db7c89355b36f62897e36124a5a2377ccfc741cd",
      "parents": [
        "4a5ef2e42a0e67db1e18f8223807b8008e68ae08"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Oct 06 15:31:52 2016 -0700"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Oct 06 22:50:30 2016 +0000"
      },
      "message": "Fix divide by zero\n\nand be stricter about the layout of various boxes in mp4 files.\n\nBug: 31318219\nChange-Id: I50034d5b6b1967ca6e88aabeacf49f26ba3c0d32\n"
    },
    {
      "commit": "4ec5187576dbe802585b60f8e38720c9da4b269b",
      "tree": "4e4e19412e77310f70d4faa5dfe8fa6caab14743",
      "parents": [
        "37a767263e347df05680ae0b8be1619c04a8d6af",
        "09374e278c81eead5b8ce6c110fe02afe57f0ccc"
      ],
      "author": {
        "name": "Hall Liu",
        "email": "hallliu@google.com",
        "time": "Wed Oct 05 20:11:47 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Oct 05 20:11:47 2016 +0000"
      },
      "message": "Rename UK tones to GB tones am: a97494e3ae\nam: 09374e278c\n\nChange-Id: Ibec2de3319b6b51b26adf2c09f0e62a97619a119\n"
    },
    {
      "commit": "0aef8ce6ab2175f3c6c30029e4f2478b66ab8720",
      "tree": "d817eeccb6f41b6828f509591dff5043ca8261fa",
      "parents": [
        "b578ed0b08c005641763f8f57413d6e859b52c86",
        "ff39fd1e3aca6d4ebafa887b22cb34d60fff4abc"
      ],
      "author": {
        "name": "Jeffrey Vander Stoep",
        "email": "jeffv@google.com",
        "time": "Tue Oct 04 21:24:22 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Oct 04 21:24:22 2016 +0000"
      },
      "message": "Merge \"mediaextractor: Skip setting  memory limits on ASan builds\" am: da1ce7f95c am: 41e71e5c92\nam: ff39fd1e3a\n\nChange-Id: I53c2d8c27635002ce3ba387983e9a4c3d14cc725\n"
    },
    {
      "commit": "a97494e3aedc0be9362c13fad1fd83ac814b76d0",
      "tree": "8d80b2fd751aaaf84c59d9d588b7e1cca157de0e",
      "parents": [
        "10da5ab24c1db8cafbb45d1397621731ca00176d"
      ],
      "author": {
        "name": "Hall Liu",
        "email": "hallliu@google.com",
        "time": "Tue Oct 04 14:23:28 2016 -0700"
      },
      "committer": {
        "name": "Hall Liu",
        "email": "hallliu@google.com",
        "time": "Tue Oct 04 14:23:28 2016 -0700"
      },
      "message": "Rename UK tones to GB tones\n\nPrevious CL which introduced UK tones was incorrect since \"uk\" is not a\nvalid ISO country code. This change checks for the \"gb\" country code\ninstead.\n\nChange-Id: I1f99a7ec5dd24a112b2b1b486fe613f965fba7ff\nFix: 31003209\n"
    },
    {
      "commit": "ff39fd1e3aca6d4ebafa887b22cb34d60fff4abc",
      "tree": "0d710bb7b997db0d17b5fdd4df4383b13b204ab4",
      "parents": [
        "c7a047a59e4165341fc4496e57892b7408485f84",
        "41e71e5c92139778c294f6df3a970d2e1e599055"
      ],
      "author": {
        "name": "Jeffrey Vander Stoep",
        "email": "jeffv@google.com",
        "time": "Mon Oct 03 22:00:37 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Oct 03 22:00:37 2016 +0000"
      },
      "message": "Merge \"mediaextractor: Skip setting  memory limits on ASan builds\" am: da1ce7f95c\nam: 41e71e5c92\n\nChange-Id: I6a5c264468553d3588b6ed03e01716c503208953\n"
    },
    {
      "commit": "b1005323ca86a545942eb64a8cfb5e84809a5791",
      "tree": "7933149e6bc1c711ca040abe2010d1962e6ccada",
      "parents": [
        "84404f068fdeec910664ec935ccd94df1e8f3ca6"
      ],
      "author": {
        "name": "Jeff Vander Stoep",
        "email": "jeffv@google.com",
        "time": "Sat Oct 01 20:26:51 2016 -0700"
      },
      "committer": {
        "name": "Jeffrey Vander Stoep",
        "email": "jeffv@google.com",
        "time": "Mon Oct 03 19:40:44 2016 +0000"
      },
      "message": "mediaextractor: Skip setting  memory limits on ASan builds\n\nASan-ified libraries have a larger memory footprint which counts\ntowards a process\u0027s RLIMIT_AS. Detect ASan at runtime and skip\nsetting memory limits.\n\nTest: Builds and boots. \"MediaUtils: running with ASan, not setting\nmemory limits\" appears in logcat, mediaextractor is no longer\ncrashing.\n\n(cherry picked from commit 4bc7ad9e0ea04928e7ed9767251696cc4a4e5d15)\n\nBug: 31831213\nChange-Id: I6705baa825cbfd45695def2cd80d8d2261b05339\n"
    },
    {
      "commit": "1621bbd89140dbbaebb71fa964ae8154767ec098",
      "tree": "2d7f861d0e1faf379bebd539ff7a0fd93d67d661",
      "parents": [
        "d5a5c18b1782a534d6996d7dc393e8bdb8f80ac1",
        "d983c8319a4632aeb64a165f38e7c3088616e7fd"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Sat Sep 24 00:58:10 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sat Sep 24 00:58:10 2016 +0000"
      },
      "message": "Fix potential heap data leak in mediadrmserver am: d36832a813\nam: d983c8319a\n\nChange-Id: I78d690176d24c0a66cec78186d0f14c2c455baee\n"
    },
    {
      "commit": "d36832a813c8a1aadcc671e99808f475a160bc22",
      "tree": "928b6be98157f98291c253aeda0667f0c70be2ab",
      "parents": [
        "2cc3afc8a5d70910e2c0e4c04c41393ff1e7effc"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Sep 23 16:01:52 2016 -0700"
      },
      "committer": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Sep 23 16:01:52 2016 -0700"
      },
      "message": "Fix potential heap data leak in mediadrmserver\n\nChange-Id: Ife4cecaeb5e301d702681c6dba9a17357232db40\nrelated-to-bug: 31657897\n"
    },
    {
      "commit": "964b71aba637bba183847394844f14a7cc1b773c",
      "tree": "60f5817256877c1573ef33b8e2edd9a7652c4cbb",
      "parents": [
        "760366445167cc7ae78ee777ce1257dd8f308595",
        "b135fb984938653d8c89c67f69d1eb56773f051c"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Sep 23 22:55:52 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Sep 23 22:55:52 2016 +0000"
      },
      "message": "Fix L3 HLS decryption am: 2cc3afc8a5\nam: b135fb9849\n\nChange-Id: I635c87f2d11306152bb69a3504cad4718f61e693\n"
    },
    {
      "commit": "2cc3afc8a5d70910e2c0e4c04c41393ff1e7effc",
      "tree": "d1f5cb864fd306b9e9d4b3a03efca4d7fbd6f2ed",
      "parents": [
        "08e1f41731ad95a0019b3733b999958a07f705ac"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Wed Sep 21 18:06:52 2016 -0700"
      },
      "committer": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Sep 23 13:38:05 2016 -0700"
      },
      "message": "Fix L3 HLS decryption\n\nA recent change to avoid returning decrypted data\nover binder assumed that in-place decryption was\nsafe. That isn\u0027t true for the L3 HLS case. This\nchange eliminates the assumption that in-place\ndecryption is safe while still returning the\ndecrypted data via shared memory, instead of\ncopying it over binder.\n\nbug: 31657897\nChange-Id: I7e480a25d2f9b08e54a4844ecdf19ba3c8af79c2\n"
    },
    {
      "commit": "379db9f7777396d2136090e771a9d90b2c6fd064",
      "tree": "f21dd5a3aa078bf002fc008244b5ecfae683580a",
      "parents": [
        "9f9a1463382d643eb9a02cd6de2bcedcc7d54fec",
        "d3d06dbc0dcab4010fff761bf07ddf1fd2c864ae"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Wed Sep 21 15:10:38 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 21 15:10:38 2016 +0000"
      },
      "message": "Check mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be am: e353ce4b3c am: 762b7a9b6e am: db8cfb97c8 am: dffa39ac23 am: 53b2b9eba3 am: 4073c59ac5 am: 093d164153 am: 0b001b52f9 am: 7197338718\nam: d3d06dbc0d\n\nChange-Id: I870e6c86361f3e2f900ecdb49c187ec62a38375c\n"
    },
    {
      "commit": "e5de6405dcd7f929cb7b412242d678132f9bcf61",
      "tree": "1f0a1b2deed447f4476eff71bce26755ee454258",
      "parents": [
        "3b0515db3405df2e759984aff7ac59aed0b16a98",
        "db7ad62386c3094a319ca048c27502c4e0f559ee"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Wed Sep 21 15:10:37 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 21 15:10:37 2016 +0000"
      },
      "message": "Check mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be am: e353ce4b3c am: 762b7a9b6e am: db8cfb97c8 am: dffa39ac23 am: 53b2b9eba3 am: 4073c59ac5 am: 093d164153 am: 0b001b52f9 am: 7197338718\nam: db7ad62386\n\nChange-Id: I499c5d2a9454e500faa23208c9ae8fd2ba929fbe\n"
    },
    {
      "commit": "d3d06dbc0dcab4010fff761bf07ddf1fd2c864ae",
      "tree": "7457493f36aff28420b29cf7bee4ef5945734799",
      "parents": [
        "27aed3e31ce9974ae3e21ec8f3bbea687f939a28",
        "7197338718d2222ba8e2e39911eeb58f2fb3c902"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Wed Sep 21 15:08:06 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 21 15:08:06 2016 +0000"
      },
      "message": "Check mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be am: e353ce4b3c am: 762b7a9b6e am: db8cfb97c8 am: dffa39ac23 am: 53b2b9eba3 am: 4073c59ac5 am: 093d164153 am: 0b001b52f9\nam: 7197338718\n\nChange-Id: I0b10d3c4c2771c904bc4d41eefce59d95dee320f\n"
    },
    {
      "commit": "db7ad62386c3094a319ca048c27502c4e0f559ee",
      "tree": "85171b2248cafe5a0b7647d5c74cf2938ea898e1",
      "parents": [
        "2b33d52dde3f6ac9ea86e247105f6348c6fe4e05",
        "7197338718d2222ba8e2e39911eeb58f2fb3c902"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Wed Sep 21 15:08:05 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 21 15:08:05 2016 +0000"
      },
      "message": "Check mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be am: e353ce4b3c am: 762b7a9b6e am: db8cfb97c8 am: dffa39ac23 am: 53b2b9eba3 am: 4073c59ac5 am: 093d164153 am: 0b001b52f9\nam: 7197338718\n\nChange-Id: I51e90ea3aa8b93faa09a62fc0eb6b2b8323be863\n"
    },
    {
      "commit": "7197338718d2222ba8e2e39911eeb58f2fb3c902",
      "tree": "50c55a9ee6d351f454c8031f19eaf05ed5418072",
      "parents": [
        "cdabec640bb62c184bb00a8613c344f439cde2e0",
        "0b001b52f9d902b0634bad4932b491d2bfa24b92"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Wed Sep 21 15:05:59 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 21 15:05:59 2016 +0000"
      },
      "message": "Check mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be am: e353ce4b3c am: 762b7a9b6e am: db8cfb97c8 am: dffa39ac23 am: 53b2b9eba3 am: 4073c59ac5 am: 093d164153\nam: 0b001b52f9\n\nChange-Id: I22af9732a7d15ab13dbf4994a0bc72d1716cc180\n"
    },
    {
      "commit": "4073c59ac5613f888cd91c73b896b50f1f9ceed6",
      "tree": "f0f57cc87d7a06a71627f0aadbdedc5d3ced468e",
      "parents": [
        "b028a26af06710a01f3e61089d8b0b51daf0851c",
        "53b2b9eba3f660cc28c077eb6eb97fedbc672a9e"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Wed Sep 21 14:57:02 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 21 14:57:02 2016 +0000"
      },
      "message": "Check mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be am: e353ce4b3c am: 762b7a9b6e am: db8cfb97c8 am: dffa39ac23\nam: 53b2b9eba3\n\nChange-Id: Ifd1146a5fa1f9ae7abe7ad559a946ca898a918ab\n"
    },
    {
      "commit": "53b2b9eba3f660cc28c077eb6eb97fedbc672a9e",
      "tree": "cf57764614547ad9f3534d469cd6b48577e36409",
      "parents": [
        "c37d5f55a5fb52fd6656aff4f4408272ba36ab15",
        "dffa39ac23f0694e645fa3fd26eb7518bde2d5f2"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Wed Sep 21 14:54:32 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 21 14:54:32 2016 +0000"
      },
      "message": "Check mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be am: e353ce4b3c am: 762b7a9b6e am: db8cfb97c8\nam: dffa39ac23\n\nChange-Id: I7f6a1264beac4f08357a5e151ec00abc127e9338\n"
    },
    {
      "commit": "dffa39ac23f0694e645fa3fd26eb7518bde2d5f2",
      "tree": "870dd544afdd2ea0f206285e67bc00ea3b85d3d4",
      "parents": [
        "b2c00418d375087cfbb966721f456822f2ea77f0",
        "db8cfb97c8ce12a771cd63d78de58dc433035fcd"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Wed Sep 21 14:52:02 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 21 14:52:02 2016 +0000"
      },
      "message": "Check mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be am: e353ce4b3c am: 762b7a9b6e\nam: db8cfb97c8\n\nChange-Id: I1f204b5117adb467d0883a59b3f1a90f4c10ba47\n"
    },
    {
      "commit": "762b7a9b6e85c747f5c805637e6f1691dda8bcf3",
      "tree": "119b578b6d5a551af92fc6a4d08a3f9695b76bb8",
      "parents": [
        "d959eb23c5d9968d77934de22eb815174929ad1b",
        "e353ce4b3c95a55df510da9376ad7878338e984f"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Wed Sep 21 14:46:30 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 21 14:46:30 2016 +0000"
      },
      "message": "Check mprotect result am: 866c800c06 am: a0cfcf38d4 am: 638aca47be\nam: e353ce4b3c\n\nChange-Id: Iba3ac429600319f099276cc774eb8b3bb85e7b25\n"
    },
    {
      "commit": "e353ce4b3c95a55df510da9376ad7878338e984f",
      "tree": "29fb1942074096be39d5f6c5218685ef51c3bead",
      "parents": [
        "9a5ec6b4c31f4d8482c81328273c7be3e656cf06",
        "638aca47bedb0b9f71f8962b1f04ab3cfc8876e8"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Wed Sep 21 14:44:02 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 21 14:44:02 2016 +0000"
      },
      "message": "Check mprotect result am: 866c800c06 am: a0cfcf38d4\nam: 638aca47be\n\nChange-Id: I337dd1d62a4cd52de051afd4d9b919a742ad20fe\n"
    },
    {
      "commit": "638aca47bedb0b9f71f8962b1f04ab3cfc8876e8",
      "tree": "a0d7c7a338193492a5c619f6055690735f983c09",
      "parents": [
        "d7822b33130a879e864b86009fcfd2b17f755b39",
        "a0cfcf38d478d42b2fc3dcb2e6a05c0a8f0a0b22"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Wed Sep 21 14:41:28 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 21 14:41:28 2016 +0000"
      },
      "message": "Check mprotect result am: 866c800c06\nam: a0cfcf38d4\n\nChange-Id: I0f188e2c717922689df42af21f6c47a865a8c390\n"
    },
    {
      "commit": "866c800c0624bb13eee44973cc8a2ecd0012de6e",
      "tree": "6c280f4333d41e3355c84ecc1b9635d805993b30",
      "parents": [
        "b602286952fc68e614a27902a6c9fd0ac390f450"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Tue Sep 20 13:36:40 2016 -0700"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Tue Sep 20 13:54:21 2016 -0700"
      },
      "message": "Check mprotect result\n\nmprotect can theoretically fail, which could then let one exploit\na vulnerable codec if one exists on the device.\n\nBug: 31350239\nChange-Id: I7b99c190619f0fb2eb93119596e6da0d2deb8ba5\n"
    },
    {
      "commit": "ddd8ab9dae557c4db8cd5b8cecfebece5af7452c",
      "tree": "91730a37aabaae48f714c0e5c755d63f4807e4fc",
      "parents": [
        "38f8318e4fe8eeafb57312d1ca9640400b2ff5de",
        "c06b784bff8f0ed3535d3f0a57acc1ede7aef4fb"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Tue Sep 20 08:11:20 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Sep 20 08:11:20 2016 +0000"
      },
      "message": "Avoid returning decrypted data over binder am: 3048485165\nam: c06b784bff\n\nChange-Id: I025aa9b7028c7fc8a789e74ca0f7bcc91b583336\n"
    },
    {
      "commit": "c06b784bff8f0ed3535d3f0a57acc1ede7aef4fb",
      "tree": "2f71774491d008461b4bd06fd75cd751a2e3028c",
      "parents": [
        "b39d520faa7a58eadc8f88504a2ad54ce92bd2c0",
        "3048485165ef692c77b30330054aaf299834fcba"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Tue Sep 20 06:37:17 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Sep 20 06:37:17 2016 +0000"
      },
      "message": "Avoid returning decrypted data over binder\nam: 3048485165\n\nChange-Id: I22666e1dcded55b9e026014d04afce2ddecd87e7\n"
    },
    {
      "commit": "2f63815ca263517988ce3d6aa3febd6f2e7291e3",
      "tree": "2f71774491d008461b4bd06fd75cd751a2e3028c",
      "parents": [
        "b83d53a156d980d81b78c51b7c7938d42695f43c",
        "3048485165ef692c77b30330054aaf299834fcba"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Tue Sep 20 04:41:52 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Sep 20 04:41:53 2016 +0000"
      },
      "message": "Merge \"Avoid returning decrypted data over binder\" into nyc-mr1-dev"
    },
    {
      "commit": "3048485165ef692c77b30330054aaf299834fcba",
      "tree": "4dd16699101068dd74412565a232452c2ea7d25a",
      "parents": [
        "3b6c92f819442a56d72dc1764eb4fbc33a73ed7d"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Sep 02 18:18:39 2016 -0700"
      },
      "committer": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Mon Sep 19 19:52:38 2016 -0700"
      },
      "message": "Avoid returning decrypted data over binder\n\nUse shared memory instead\n\nb/29514618\n\nChange-Id: Iba82053f7c965c7bead816654827cbf94d3b2a9d\n"
    },
    {
      "commit": "60325bcfaedd25eaa02e7ff4aae1075cda0610d4",
      "tree": "af7741bb110793c8cae1c72c616d2361592752c4",
      "parents": [
        "a6c2a013cf190c2cfbc8332e90178ff8bd0b8068",
        "df4e98235f481a777588d2eae1f153293ff8e5c5"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Sep 20 02:37:47 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Sep 20 02:37:47 2016 +0000"
      },
      "message": "IMediaSource: fix local MediaBufferGroup refcount am: 9996d9d396\nam: df4e98235f\n\nChange-Id: Ib6d6f1c296321bba587e3517d29625b4c016ffe6\n"
    },
    {
      "commit": "df4e98235f481a777588d2eae1f153293ff8e5c5",
      "tree": "e8d94429126589076f5cfeab819addc83735ce61",
      "parents": [
        "c82f4ce992a437f24123104f13f3d4592799535f",
        "9996d9d39618b89d0f85c98b8036f003290f0d7e"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Sep 20 00:21:35 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Sep 20 00:21:35 2016 +0000"
      },
      "message": "IMediaSource: fix local MediaBufferGroup refcount\nam: 9996d9d396\n\nChange-Id: Id12f76a8618877fc0bf4ed1b550108df164c9a4a\n"
    },
    {
      "commit": "aac112a031d52dacc467bc0a6a889a90da2792d5",
      "tree": "e8d94429126589076f5cfeab819addc83735ce61",
      "parents": [
        "7b973eb89ea7088fe82f457cd10013bbe739bba4",
        "9996d9d39618b89d0f85c98b8036f003290f0d7e"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Mon Sep 19 22:07:52 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Sep 19 22:07:52 2016 +0000"
      },
      "message": "Merge \"IMediaSource: fix local MediaBufferGroup refcount\" into nyc-mr1-dev"
    },
    {
      "commit": "d5d60f642d1d2620b120ca46b1d409007f494321",
      "tree": "b475d21e4c16ab82b2f384041034479af9f87c61",
      "parents": [
        "705b64ab843bd0a305587b557c57bda5b062ebcc"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Mon Sep 19 08:16:17 2016 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Mon Sep 19 08:56:45 2016 -0700"
      },
      "message": "fix build\n\nRevert incorrectly merged f8a4cb410115045278f534e54b41ac78d6bf6c07.\nMerge 7c3c2fa3e233c656fc8c2fc2a6634b3ecf8a23e8 instead.\n\nKeep fixes to these that were merged in since then.\n"
    },
    {
      "commit": "9996d9d39618b89d0f85c98b8036f003290f0d7e",
      "tree": "d56778f1f5a1d539a925c2d59a7659adf27f8fc0",
      "parents": [
        "94a82dcdb9f7bc3027b4cfbda8990a4e4c47e163"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Thu Sep 15 18:19:49 2016 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Fri Sep 16 10:50:25 2016 -0700"
      },
      "message": "IMediaSource: fix local MediaBufferGroup refcount\n\nBug: 31526329\nChange-Id: Ib596454e1c224e135dd51f95b0182f86d9e76f55\n"
    },
    {
      "commit": "071a1d2752101140d921d8c20b3c76cebd990228",
      "tree": "fd1651124bd4e8013f8fe4677a309063563a92dc",
      "parents": [
        "a91abe176f4cf8b8a29f4629c657613b43c28314",
        "524354319acd9ffb7f6853bb44fb7b255d46d899"
      ],
      "author": {
        "name": "ganxiaolin",
        "email": "ganxiaolin@xiaomi.com",
        "time": "Fri Sep 16 01:46:23 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Sep 16 01:46:23 2016 +0000"
      },
      "message": "Remove force argument to ensure mCaptureThread exit within Visualizer destructor am: 2e5b5704b0\nam: 524354319a\n\nChange-Id: Ie415398b2a6b603c8ada1e89fafe865cddfe2ac9\n"
    },
    {
      "commit": "1658f22ef0f4e4ae5640d2474fc138dab4a84844",
      "tree": "c71da10750279c780cdfba5471bcc0ac80bfa640",
      "parents": [
        "db135b50ff223f1f1c042957766ab4c8222fe92d"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Tue Aug 02 07:07:05 2016 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Sep 15 13:44:27 2016 -0700"
      },
      "message": "IOMX: work against metadata buffer spoofing\n\n- Prohibit direct set/getParam/Settings for extensions meant for\n  OMXNodeInstance alone. This disallows enabling metadata mode\n  without the knowledge of OMXNodeInstance.\n- Do not share metadata mode buffers cross process.\n- Disallow setting up metadata mode/tunneling/input surface\n  after first sendCommand.\n- Disallow store-meta for input cross process.\n- Disallow emptyBuffer for surface input (via IOMX).\n- Fix checking for input surface.\n\nBug: 29422020\nChange-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e\n"
    },
    {
      "commit": "2e5b5704b0028d8cf9467789dd0c01709644a523",
      "tree": "ec152f299946d58300cd1922fc3a624082cb98da",
      "parents": [
        "41f2c47c0019b2a979ebe79241c5eb6ce14c0a3f"
      ],
      "author": {
        "name": "ganxiaolin",
        "email": "ganxiaolin@xiaomi.com",
        "time": "Fri Jan 29 19:57:57 2016 +0800"
      },
      "committer": {
        "name": "rago",
        "email": "rago@google.com",
        "time": "Thu Sep 15 12:03:27 2016 -0700"
      },
      "message": "Remove force argument to ensure mCaptureThread exit within Visualizer destructor\n\nUpdated logic for exit request when effect is disabled.\nThis CL includes some original changes suggested by:\nganxiaolin \u003cganxiaolin@xiaomi.com\u003e\n\nBug: 30684284\n\nChange-Id: I77768e8204e712f3fd9d0a9bf768de3cb578d6ce\n"
    },
    {
      "commit": "1935f3102352256a6388224a49013c3b05b8f8d8",
      "tree": "76ddbee5e40970f4d50e9b9c95ec47bb794a58c0",
      "parents": [
        "c50fb8f32b23f90c620fc5237564c227cc0c7cb3",
        "b4fb66000ff1148db0cc47697eda87dcbb0805c1"
      ],
      "author": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Wed Sep 14 17:49:50 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 14 17:49:50 2016 +0000"
      },
      "message": "AudioFlinger: flush direct tracks that are paused am: 4bb650bb3c\nam: b4fb66000f\n\nChange-Id: I7b6a1b64871d40f50aea5a127219be210b9acb60\n"
    },
    {
      "commit": "b4fb66000ff1148db0cc47697eda87dcbb0805c1",
      "tree": "ebee63726eaf20dbe801f70274470a9f508f3cb4",
      "parents": [
        "41341070fcf63b96f3b0ac8ebff7cef335c54d61",
        "4bb650bb3c4f15789232f3f3cf778c5441122360"
      ],
      "author": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Wed Sep 14 17:41:27 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 14 17:41:27 2016 +0000"
      },
      "message": "AudioFlinger: flush direct tracks that are paused\nam: 4bb650bb3c\n\nChange-Id: I86d50d180819dfb7abed479905fb5921b69188b5\n"
    },
    {
      "commit": "a930117eb3c4e184395f87b5b6d7639dc11576d9",
      "tree": "ebee63726eaf20dbe801f70274470a9f508f3cb4",
      "parents": [
        "7c6bd7b17835cfa615d1f74aa7fe7c45c7190e4d",
        "4bb650bb3c4f15789232f3f3cf778c5441122360"
      ],
      "author": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Wed Sep 14 17:26:23 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Sep 14 17:26:23 2016 +0000"
      },
      "message": "Merge \"AudioFlinger: flush direct tracks that are paused\" into nyc-mr1-dev"
    },
    {
      "commit": "4bb650bb3c4f15789232f3f3cf778c5441122360",
      "tree": "38aeb0e3fe7cd024923114813d41b0dbf4ed88aa",
      "parents": [
        "3fb45bb6396f245ae7b47dcfe02fb600eec0b84c"
      ],
      "author": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Fri Sep 09 12:11:17 2016 -0700"
      },
      "committer": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Mon Sep 12 17:11:30 2016 -0700"
      },
      "message": "AudioFlinger: flush direct tracks that are paused\n\nNormally the flush is processed on ObtainBuffer.\nBut that is not called when the track is paused.\nSo it was not possible to flush and re-prime a\ntrack that was paused.\n\nNow we flush synchronously for inactive tracks,\nand flush from prepareTracks_l for active tracks.\n\nBug: 19193985\nBug: 27791443\nChange-Id: I39a7e4921e45041c3a51cf91fd3995b5edee6dd4\nSigned-off-by: Phil Burk \u003cphilburk@google.com\u003e\n"
    },
    {
      "commit": "ff97bcaf881576703e6a9af014f87529b3af774e",
      "tree": "1983b840fcaaddf12bee569a5ffc8596706c84ed",
      "parents": [
        "e137599d76a60339c7418074de04c55104f23ae2",
        "e2538f2f9b5d81ce53dc13bbf87b2f36f6c45eb5"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Fri Sep 09 18:58:05 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Sep 09 18:58:05 2016 +0000"
      },
      "message": "Improve MediaBuffer robustness for remote clients am: 9bd3c9b0e8\nam: e2538f2f9b\n\nChange-Id: I8d378f6c64bfe9a97941cddafe6c3163abc7a050\n"
    },
    {
      "commit": "e2538f2f9b5d81ce53dc13bbf87b2f36f6c45eb5",
      "tree": "121e1ebc3dd71e40c1df0fdf85314c19f7a9b0f1",
      "parents": [
        "75bd2b9014d2926b869350395d7cfb5f329da905",
        "9bd3c9b0e894c9f6c48a2cfa7c5f21d384b1c596"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Fri Sep 09 17:58:50 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Sep 09 17:58:50 2016 +0000"
      },
      "message": "Improve MediaBuffer robustness for remote clients\nam: 9bd3c9b0e8\n\nChange-Id: I3abb06e498b8951e5e934d0127e12b9adb65707c\n"
    },
    {
      "commit": "9bbafdb5b4266d51d868844c624a33035a2abea1",
      "tree": "121e1ebc3dd71e40c1df0fdf85314c19f7a9b0f1",
      "parents": [
        "01b589c3e1976672dc9106d17c6e0095915082be",
        "9bd3c9b0e894c9f6c48a2cfa7c5f21d384b1c596"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Fri Sep 09 17:53:46 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Sep 09 17:53:46 2016 +0000"
      },
      "message": "Merge \"Improve MediaBuffer robustness for remote clients\" into nyc-mr1-dev"
    },
    {
      "commit": "61bb7a0d99bcacac5ae4ea2171add8d4dd9ea459",
      "tree": "4331e45a52581bd856bea1abd2f6189a2785a5a7",
      "parents": [
        "beb7008c2e6c8ee71b5e5aaf101990ea52a67da1",
        "da3cba194bff674f5a3f4b0249a651b00ab00c37"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Sep 09 17:00:44 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Sep 09 17:00:44 2016 +0000"
      },
      "message": "DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 9a4768f7bf\nam: da3cba194b\n\nChange-Id: I018340e57d237e4d36d68e2cd118336242447b9c\n"
    },
    {
      "commit": "c5251a627cd1c4c9403c80458fa10768813e7202",
      "tree": "fe4ae673410484aa9ddd73a94eb2fba87ce8401c",
      "parents": [
        "0dd714e4081b874425aef6c40b152fb918ae595e",
        "ee9effab3decc4275f4365b78c96911018e8de8c"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Sep 09 16:59:46 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Sep 09 16:59:46 2016 +0000"
      },
      "message": "DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c\nam: ee9effab3d\n\nChange-Id: I64bd10fa5e5e5a020c129c0b77d813a2772376a0\n"
    },
    {
      "commit": "8751b3c3ac6a6cc606a0fce1e8ed0a01a1168c08",
      "tree": "1abd48dce8c96f2bb3126a41ff0c53509aa12524",
      "parents": [
        "647f55d75de0a6b09b2171682e78de34160f09f2",
        "f8a4cb410115045278f534e54b41ac78d6bf6c07"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Sep 09 16:56:46 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Sep 09 16:56:46 2016 +0000"
      },
      "message": "IOMX: work against metadata buffer spoofing\nam: f8a4cb4101\n\nChange-Id: I3aeec794c96fe3b0000546700e010b5ddc6e4f0f\n"
    },
    {
      "commit": "030fbd4835412d07edcfb80230d930c3819dd2ee",
      "tree": "4783d31fd627ae6625b21f92840d4cb9c6e4d30f",
      "parents": [
        "9a6861cbd3bb0e1b8fe4c105795256ee032f9664",
        "f8a4cb410115045278f534e54b41ac78d6bf6c07"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Sep 09 16:52:15 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Sep 09 16:52:15 2016 +0000"
      },
      "message": "Merge \"IOMX: work against metadata buffer spoofing\" into mnc-dev"
    },
    {
      "commit": "9bd3c9b0e894c9f6c48a2cfa7c5f21d384b1c596",
      "tree": "a09214342f1a34d1b2d1188dc1fe55fd172994aa",
      "parents": [
        "57d8e70186106995ec0ae0891f014a3209f71551"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed Sep 07 14:42:55 2016 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Thu Sep 08 20:09:54 2016 -0700"
      },
      "message": "Improve MediaBuffer robustness for remote clients\n\nAllow remote process to die or behave incorrectly.\n\nBug: 31060086\nChange-Id: I01bc8984287fed61a46083ec090b7773e49158a9\n"
    },
    {
      "commit": "dd7e169bd1e6bc1688ffb732b8fa1c75656ae719",
      "tree": "45e875c390355a62fb8386f3799237250a196593",
      "parents": [
        "6ba9b60facdffc9dfdd6e8792798f27d51c104ba",
        "9ede6cef5e2cf5822f826eb9df980dcb7337ea41"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Wed Sep 07 19:16:51 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 07 19:16:51 2016 +0000"
      },
      "message": "Fix stack content leak vulnerability in mediaserver am: 9a6861cbd3 am: 647f55d75d am: b6d08633e9 am: 7d616daf2b am: b57b64d46d\nam: 9ede6cef5e\n\nChange-Id: If4e0de93975dacfeb2bac69646a86b8a18d516a7\n"
    },
    {
      "commit": "95bad3eabb56b920deaae5b298e84a9e0ed1aab2",
      "tree": "fad89b8d40195820d2ee1c4ac5572e4258b57262",
      "parents": [
        "6f6d337de47002829c1768b4bab844c2800a4ee6",
        "fd14435afe8076a2268cb92614d9eb3cc2ea9086"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Wed Sep 07 19:14:21 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 07 19:14:21 2016 +0000"
      },
      "message": "Fix stack content leak vulnerability in mediaserver am: 9a6861cbd3 am: 647f55d75d am: b6d08633e9 am: 7d616daf2b am: b57b64d46d\nam: fd14435afe\n\nChange-Id: I4294c3eb6624f181120c56cc9938d0f12aaefd15\n"
    },
    {
      "commit": "9ede6cef5e2cf5822f826eb9df980dcb7337ea41",
      "tree": "822c27c744a972f720ce5d6c075c0a818fae54f9",
      "parents": [
        "bcc30e06dd15244e2824161f6898ad6c37f66c92",
        "b57b64d46d7150b40a81629a89074af8212c661c"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Wed Sep 07 19:11:51 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 07 19:11:51 2016 +0000"
      },
      "message": "Fix stack content leak vulnerability in mediaserver am: 9a6861cbd3 am: 647f55d75d am: b6d08633e9 am: 7d616daf2b\nam: b57b64d46d\n\nChange-Id: I85758471a3e01105986b1975b55287ce02161178\n"
    },
    {
      "commit": "fd14435afe8076a2268cb92614d9eb3cc2ea9086",
      "tree": "36370ecf8052ec3c5b8d42cc968db16b7f5580b8",
      "parents": [
        "95852cbbbb3d1caabc6d03444d9a762bb78aee5d",
        "b57b64d46d7150b40a81629a89074af8212c661c"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Wed Sep 07 19:11:49 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 07 19:11:49 2016 +0000"
      },
      "message": "Fix stack content leak vulnerability in mediaserver am: 9a6861cbd3 am: 647f55d75d am: b6d08633e9 am: 7d616daf2b\nam: b57b64d46d\n\nChange-Id: If69ee138c4648d060fc0d3f6ab120ea1595dd203\n"
    },
    {
      "commit": "b57b64d46d7150b40a81629a89074af8212c661c",
      "tree": "53c3fbcf316f102bd7794baea19a8f20a86b89a0",
      "parents": [
        "22fdb93234e1e5d8c384a75c05e01ee92e20e61a",
        "7d616daf2beb994e3c4dc1bc0ea853388d88892e"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Wed Sep 07 19:08:37 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 07 19:08:37 2016 +0000"
      },
      "message": "Fix stack content leak vulnerability in mediaserver am: 9a6861cbd3 am: 647f55d75d am: b6d08633e9\nam: 7d616daf2b\n\nChange-Id: I31fea7042e670c4e2bfbb9225b012e203d5a43bf\n"
    },
    {
      "commit": "647f55d75de0a6b09b2171682e78de34160f09f2",
      "tree": "9d3453a384d9d35fc969b6110ed9c25fe7de236e",
      "parents": [
        "81e055751904469db7233f4698a9b6a8a1d50900",
        "9a6861cbd3bb0e1b8fe4c105795256ee032f9664"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Wed Sep 07 19:01:22 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 07 19:01:22 2016 +0000"
      },
      "message": "Fix stack content leak vulnerability in mediaserver\nam: 9a6861cbd3\n\nChange-Id: I3c8d56b18678f68ff4617620312c4c32d4e0baf7\n"
    },
    {
      "commit": "9a6861cbd3bb0e1b8fe4c105795256ee032f9664",
      "tree": "68879d289cd3e1eceaab8e0a37a809d7d9ef1078",
      "parents": [
        "50b9d889e637ff3c26e4582edc91ff0c2111fd6d"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Sep 02 11:36:46 2016 -0700"
      },
      "committer": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Sep 02 18:40:40 2016 +0000"
      },
      "message": "Fix stack content leak vulnerability in mediaserver\n\nbug: 30875060\nChange-Id: I03f4d08b7b31ac5b507cfc9e65e5607c73972d95\n"
    },
    {
      "commit": "55490dcc954dc04aaabcaf0bb0dfc44af9bf2c01",
      "tree": "78a49334dd9a0458e7c3b733dc2142e345cdfc02",
      "parents": [
        "ddc9bee8126638dcbc7f13d80b9ac493d00d63cd",
        "04fdc1579006533a634e7071b02976652b747382"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Tue Aug 30 01:24:01 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Aug 30 01:24:01 2016 +0000"
      },
      "message": "Merge \"Convert to Android.bp\" am: dd780c160d am: 1ee5667b7e\nam: 04fdc15790\n\nChange-Id: I4f3a0801a6166921ba5bc93abb81dc6abf6121bb\n"
    },
    {
      "commit": "04fdc1579006533a634e7071b02976652b747382",
      "tree": "160822c848a6273d856df1411e5a8efa90c3929a",
      "parents": [
        "4da193918353611cba08af4b160c0c8ac93d5e9e",
        "1ee5667b7e2541f598d3591b4375a75b2b190c1f"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Tue Aug 30 01:19:54 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Aug 30 01:19:54 2016 +0000"
      },
      "message": "Merge \"Convert to Android.bp\" am: dd780c160d\nam: 1ee5667b7e\n\nChange-Id: Ib85518624aedc9099e1aab4757e5e7c95afd6fac\n"
    },
    {
      "commit": "442a2ee35a2c3922237540aed8c16481e03dfb0d",
      "tree": "d0f167e5bc7adc3e72da4b0baab99e06b47d60cd",
      "parents": [
        "1567662f5a709398004cf509fb3f382f0c76f5b1"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Fri Aug 26 17:52:29 2016 -0700"
      },
      "committer": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Fri Aug 26 17:52:29 2016 -0700"
      },
      "message": "Convert to Android.bp\n\nSee build/soong/README.md for more information.\n\nChange-Id: Ib5abad8bcb63bd3f3aa19a08817276fe21902515\n"
    },
    {
      "commit": "3c901299c6c0a8a7f52b2a2895cff80886777ada",
      "tree": "d2cbfda50058af0f380308ff2a47058cb0eb64a9",
      "parents": [
        "8acb47a973c0b0eecdc36f0bccd513a11be9ccd7",
        "b2544bcc983661420fedd1d92944c556d721fe66"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Aug 23 22:54:22 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Aug 23 22:54:22 2016 +0000"
      },
      "message": "sched_getscheduler may include SCHED_RESET_ON_FORK am: 8255ba7b40 am: f4da60ebc2\nam: b2544bcc98\n\nChange-Id: I8e28c76bf3936f67f4a503b0d7cf438c19c8e472\n"
    },
    {
      "commit": "f4da60ebc2c527a3f5afca30a28b1d73801ea850",
      "tree": "2355fa1bd7d982cc5af00b098da8523a9a628f97",
      "parents": [
        "dedfb43c7cb81a82e5266e420e96e21703d96084",
        "8255ba7b40774b2b8868482f1a302db3ae98e905"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Aug 23 22:49:03 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Aug 23 22:49:03 2016 +0000"
      },
      "message": "sched_getscheduler may include SCHED_RESET_ON_FORK\nam: 8255ba7b40\n\nChange-Id: I525d60cb487c87c517ba1edeadaf29b5f9a6cb54\n"
    },
    {
      "commit": "8255ba7b40774b2b8868482f1a302db3ae98e905",
      "tree": "abba9d2c478e9add3fc31ce7836d8a4ce00011b5",
      "parents": [
        "2180a83292987f2289650ff0853e031cd3c796ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Aug 23 13:54:23 2016 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Aug 23 14:06:33 2016 -0700"
      },
      "message": "sched_getscheduler may include SCHED_RESET_ON_FORK\n\nThe SCHED_RESET_ON_FORK flag is visible in the policy value returned by sched_getscheduler()\n\nBug: 31020591\nChange-Id: I5243fadce2a5f629fa2dc61888d8aa9aff32d9ca\n"
    },
    {
      "commit": "9a4768f7bfcd4654f93ad9b22eff87df493a9d5e",
      "tree": "6ce64deb9302b71b954bd076210592384598f082",
      "parents": [
        "0e2cc67785e417da3df72b3e7d8fcb792582b076"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Tue Aug 02 07:07:05 2016 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Aug 18 14:29:49 2016 -0700"
      },
      "message": "DO NOT MERGE: IOMX: work against metadata buffer spoofing\n\n- Prohibit direct set/getParam/Settings for extensions meant for\n  OMXNodeInstance alone. This disallows enabling metadata mode\n  without the knowledge of OMXNodeInstance.\n- Do not share metadata mode buffers cross process.\n- Disallow setting up metadata mode/tunneling/input surface\n  after first sendCommand. (Except to Idle for OMXCodec quirk.)\n- Disallow store-meta for input cross process.\n- Disallow emptyBuffer for surface input (via IOMX).\n- Fix checking for input surface.\n\n[backported from M]\n\nBug: 29422020\nChange-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e\n"
    },
    {
      "commit": "86369364a07c85dd8f0e890b783a7bd434b8ef7c",
      "tree": "6a17ee31928e7fef5edee7d01467a0208f303cf3",
      "parents": [
        "8f4b1a7de0e102b9203cfda3970edd2eedd9becf"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Tue Aug 02 07:07:05 2016 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Aug 18 14:25:51 2016 -0700"
      },
      "message": "DO NOT MERGE: IOMX: work against metadata buffer spoofing\n\n- Prohibit direct set/getParam/Settings for extensions meant for\n  OMXNodeInstance alone. This disallows enabling metadata mode\n  without the knowledge of OMXNodeInstance.\n- Do not share metadata mode buffers cross process.\n- Disallow setting up metadata mode/tunneling/input surface\n  after first sendCommand. (Except to Idle state for OMXCodec quirk.)\n- Disallow store-meta for input cross process.\n- Disallow emptyBuffer for surface input (via IOMX).\n- Fix checking for input surface.\n\n[backported from L-MR1]\n\nBug: 29422020\nChange-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e\n"
    },
    {
      "commit": "807e827d4c1196754faaf138cb93c57c5b137e69",
      "tree": "af2fecd37fa95b1dfa1aaff16d6789d7f3131e33",
      "parents": [
        "17a10c50e20d934c1ac5956fe9019d3013e3f8b3"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Tue Aug 02 07:07:05 2016 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Aug 18 14:16:15 2016 -0700"
      },
      "message": "DO NOT MERGE: IOMX: work against metadata buffer spoofing\n\n- Prohibit direct set/getParam/Settings for extensions meant for\n  OMXNodeInstance alone. This disallows enabling metadata mode\n  without the knowledge of OMXNodeInstance.\n- Do not share metadata mode buffers cross process.\n- Disallow setting up metadata mode/input surface\n  after first sendCommand (except to Idle for OMXCodec quirk).\n- Disallow store-meta for input cross process.\n- Disallow emptyBuffer for surface input (via IOMX).\n- Fix checking for input surface.\n\n[backported from L]\n\nBug: 29422020\nChange-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e\n"
    },
    {
      "commit": "b29385110c3f6a52e209c0e1cf70e9cf2eed5e89",
      "tree": "722a025510796ae61a30b2c7c99ca64d111c790a",
      "parents": [
        "6da0f8d15b38d7979caf22cf5865a959358f9c58"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Aug 18 12:49:40 2016 +0000"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Aug 18 18:38:43 2016 +0000"
      },
      "message": "Merge \"Fix for tone glitch produced in ToneGenerator\" am: 46f1c24c5a am: 84183ba496 am: 09b0b40fb4\nam: 67b5bb745b\n\nBug: 29922404\n\nChange-Id: Ie5185fda8ad4043ec199e9ebe74e67974ce7e44f\n(cherry picked from commit 7f68f0f06504664b8b328f8b99ab5479f9dbd1a8)\n"
    },
    {
      "commit": "67b5bb745b1eb502cf6cfcd4fc8f7b2e4dccff59",
      "tree": "85384ba055779ce2449dd722dbe76ff559faf65b",
      "parents": [
        "149df9f07107e249acec848c5a53d7b4c0d16a16",
        "09b0b40fb4668726622891d40f16984c29ff05ba"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Aug 18 12:46:10 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Aug 18 12:46:10 2016 +0000"
      },
      "message": "Merge \"Fix for tone glitch produced in ToneGenerator\" am: 46f1c24c5a am: 84183ba496\nam: 09b0b40fb4\n\nChange-Id: I0b2765bba69b2de8ec6a5d6cdc894c03e587ce2a\n"
    },
    {
      "commit": "09b0b40fb4668726622891d40f16984c29ff05ba",
      "tree": "0d8a870146feb881424e349bee744cefd32c7c26",
      "parents": [
        "de1567cc34957bfbf5042e0cdaf2a40e907cafd8",
        "84183ba49683678a3420c4c1108be7c1be69443c"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Aug 18 12:43:10 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Aug 18 12:43:10 2016 +0000"
      },
      "message": "Merge \"Fix for tone glitch produced in ToneGenerator\" am: 46f1c24c5a\nam: 84183ba496\n\nChange-Id: Iae5baa5892962245143dfecf4bac156dfe5a7912\n"
    },
    {
      "commit": "84183ba49683678a3420c4c1108be7c1be69443c",
      "tree": "11c045f03a68cad20425e1448fbdc11fb9242b9f",
      "parents": [
        "c3fd10acaa47bc973e31f71f1925b8a2797b731a",
        "46f1c24c5ac7711702147c4db20e791827a88371"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Aug 18 12:40:13 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Aug 18 12:40:13 2016 +0000"
      },
      "message": "Merge \"Fix for tone glitch produced in ToneGenerator\"\nam: 46f1c24c5a\n\nChange-Id: If7da9dbfe106fdda640fc817a4fffe05b2ed5dff\n"
    },
    {
      "commit": "46f1c24c5ac7711702147c4db20e791827a88371",
      "tree": "032afd3f2cb059fa6b5445e8a442bffc86921b3c",
      "parents": [
        "b480ab936556056851ea5cecaed1528b6b035884",
        "f97b682f0e4a08bb6211f230a789a80981a7111c"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Aug 18 12:35:37 2016 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Thu Aug 18 12:35:37 2016 +0000"
      },
      "message": "Merge \"Fix for tone glitch produced in ToneGenerator\""
    },
    {
      "commit": "149df9f07107e249acec848c5a53d7b4c0d16a16",
      "tree": "babcf251c7a372bcc0771df7b88d6f3c0d135a67",
      "parents": [
        "e3fd0d0c51d81fdc3f7b6892f8f3f2f821065009",
        "fde5258be5f178373453c3b3ab0053f65132a405"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Thu Aug 18 01:36:30 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Aug 18 01:36:30 2016 +0000"
      },
      "message": "MediaBuffer: Only use shared memory for processes that export MediaBuffers am: cfa86b5efa\nam: fde5258be5\n\nChange-Id: I63edca0af5b025d650e9409045aa3b691555a21e\n"
    },
    {
      "commit": "cfa86b5efa029391df04182dedfabd72b49a32f5",
      "tree": "e26ec826495e196ed1c781ccb4540d10df5fb5dd",
      "parents": [
        "90f7c37361c22f86bd3d63d22c27fbea34c188e1"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Fri Jul 29 19:25:07 2016 -0700"
      },
      "committer": {
        "name": "Thierry Strudel",
        "email": "tstrudel@google.com",
        "time": "Thu Aug 18 00:06:28 2016 +0000"
      },
      "message": "MediaBuffer: Only use shared memory for processes that export MediaBuffers\n\nReduces excess file descriptors and shared memory creation and releases.\n\nBug: 28930897\nBug: 30341084\nChange-Id: I8190e22dd800f25be79ec33cb02613d15482e1d4\n"
    },
    {
      "commit": "5ca8f32280377dd923e72c3c6bd3994217461b8b",
      "tree": "b5146ce7885539d8b002d3270346f574e3965711",
      "parents": [
        "7aeb8c8d4437eb8f45be3ad3828764795e14ad4c",
        "63ef5a38f82d22c1f97922fe490a1fd336566d5c"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed Aug 10 23:53:01 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Aug 10 23:53:01 2016 +0000"
      },
      "message": "resolve merge conflicts of fd923e7 to stage-aosp-master am: df5d9246f9\nam: 63ef5a38f8\n\nChange-Id: I516a43c5e56323e99ad7a8ca2e4811b77c9704f4\n"
    },
    {
      "commit": "63ef5a38f82d22c1f97922fe490a1fd336566d5c",
      "tree": "e84028568dbcede5ffdaf58be20c6cc080028edd",
      "parents": [
        "b8750e114b6fd99768c45233d4b2ffb2b198f5d1",
        "df5d9246f9607b1c2f8b134c46a05af06e206da3"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed Aug 10 23:50:01 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Aug 10 23:50:01 2016 +0000"
      },
      "message": "resolve merge conflicts of fd923e7 to stage-aosp-master\nam: df5d9246f9\n\nChange-Id: I20767244fef48ad42334c5131e2d402f75bb7327\n"
    },
    {
      "commit": "df5d9246f9607b1c2f8b134c46a05af06e206da3",
      "tree": "7cd9fcb42c86c8cfe950db239e21e8b5ece98369",
      "parents": [
        "7ad2854adc0abe8dd7909a6ed401107ad09bc3d2",
        "fd923e7fe2779bcd69d79471b8c30c8b98918f62"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed Aug 10 15:40:39 2016 -0700"
      },
      "committer": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed Aug 10 16:10:32 2016 -0700"
      },
      "message": "resolve merge conflicts of fd923e7 to stage-aosp-master\n\nChange-Id: I75b44b89bae41197a1fd68362d20b8ba2b4dd192\n"
    },
    {
      "commit": "36d0ca16024820df9a12903d2ac443fabcc180bc",
      "tree": "51e8f285ae66ad7cb922caeb7ba8d5f1d20367e3",
      "parents": [
        "67fbddfdc2cafd63c83d3bb55a2451d4c26f546d"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Tue Aug 09 14:31:32 2016 -0700"
      },
      "committer": {
        "name": "Chih-hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed Aug 10 17:56:35 2016 +0000"
      },
      "message": "Fix clang-tidy warnings in audio and playerservice.\n\n* Add explicit keyword to conversion constructors.\nBug: 28341362\n* Use const reference type for read-only parameters.\nBug: 30407689\nTest: build with WITH_TIDY\u003d1\n\nChange-Id: I265f3b094e08d5705b506b3fbba51439c134af84\nMerged-In: I265f3b094e08d5705b506b3fbba51439c134af84\n"
    },
    {
      "commit": "f8a4cb410115045278f534e54b41ac78d6bf6c07",
      "tree": "277909e121cf816d871fc1203b58f87413f83be0",
      "parents": [
        "7ab70a7ba9ff522d45763af48d15aac805738d9c"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Tue Aug 02 07:07:05 2016 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Aug 03 14:39:52 2016 +0000"
      },
      "message": "IOMX: work against metadata buffer spoofing\n\n- Prohibit direct set/getParam/Settings for extensions meant for\n  OMXNodeInstance alone. This disallows enabling metadata mode\n  without the knowledge of OMXNodeInstance.\n- Do not share metadata mode buffers cross process.\n- Disallow setting up metadata mode/tunneling/input surface\n  after first sendCommand.\n- Disallow store-meta for input cross process.\n- Disallow emptyBuffer for surface input (via IOMX).\n- Fix checking for input surface.\n\nBug: 29422020\nChange-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e\n"
    },
    {
      "commit": "d393216f2744b2f7359814c595e4e384e0b776f3",
      "tree": "1d35328f569999f1cb4696c97f5590d400dcaea1",
      "parents": [
        "a1fb95e93ce0da11be387982f7744436198d9bbf",
        "0edaaefadda405caea639fee34c1e7fb17205ec8"
      ],
      "author": {
        "name": "Tyler Gunn",
        "email": "tgunn@google.com",
        "time": "Tue Aug 02 20:18:11 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Aug 02 20:18:11 2016 +0000"
      },
      "message": "Add Australia specific supervisory tones. am: 50029b6d73\nam: 0edaaefadd\n\nChange-Id: I9a46fafda33e1fa710c130ca09dde878f293eac4\n"
    },
    {
      "commit": "50029b6d7333197cc3d48e5d7e3bfd6ac3a288f0",
      "tree": "15ca6fc134b54c51238f60c24921fb4280c6f892",
      "parents": [
        "f929f9b203ef4787d45f8b24aab053aaab993be9"
      ],
      "author": {
        "name": "Tyler Gunn",
        "email": "tgunn@google.com",
        "time": "Mon Aug 01 15:14:15 2016 -0700"
      },
      "committer": {
        "name": "Tyler Gunn",
        "email": "tgunn@google.com",
        "time": "Mon Aug 01 15:14:15 2016 -0700"
      },
      "message": "Add Australia specific supervisory tones.\n\nSource: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf\n\nBug: 30492475\nChange-Id: I39bab77ec4db8c81aa0e9f6c509c67970a76ab81\n"
    },
    {
      "commit": "b25395b1711f680bfc2b285c4f8577c8e9293898",
      "tree": "df6a50024ce527717892e43d745ad1899efae4a6",
      "parents": [
        "da440aeb9acf869cd3b58819df9b55068ef97821",
        "7711c90d957514efd5fa68d3fdf269e919a36720"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Jul 26 18:19:46 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 26 18:19:46 2016 +0000"
      },
      "message": "ToneGenerator: Increase buffer framecount\nam: 7711c90d95\n\nChange-Id: I6754d4fa3a9a227ba90ec4b491f499fe57e8582a\n"
    },
    {
      "commit": "5cd258a918f4eebde4b899f71126cbfba42895c7",
      "tree": "a9360472686a85cc797ad626926e06ed74a350de",
      "parents": [
        "e14cd31cd671bd8ad3e7c7cc58bd7a625442051c",
        "7711c90d957514efd5fa68d3fdf269e919a36720"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Jul 26 18:06:11 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Jul 26 18:06:11 2016 +0000"
      },
      "message": "Merge \"ToneGenerator: Increase buffer framecount\" into nyc-mr1-dev"
    },
    {
      "commit": "0e0c9f059b5ec9136367203880757a9b7758e86f",
      "tree": "18de23b2867e5c8ccd9898f029853b148c45b396",
      "parents": [
        "1c1fb278beee64ed090c2257e7fd2c7406730751",
        "0a2f151f37c715078351ae0be99b0c4dbabc2a23"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Jul 26 15:02:04 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 26 15:02:04 2016 +0000"
      },
      "message": "Fix AudioRecord::read and AudioTrack::write return\nam: 0a2f151f37\n\nChange-Id: I9926f0046a6e2f550be852faf4b4d08d8c444260\n"
    },
    {
      "commit": "7711c90d957514efd5fa68d3fdf269e919a36720",
      "tree": "f62994b25978d76851a7395fd775cf038618b590",
      "parents": [
        "11dd692efa611d129167abea854dc14f0046d727"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Mon Jul 25 17:53:23 2016 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Mon Jul 25 19:15:45 2016 -0700"
      },
      "message": "ToneGenerator: Increase buffer framecount\n\nUsing default fast track buffer size made glitches evident;\nincrease to at least process size.\n\nBug: 29345846\nChange-Id: Ib554f31d5f5731dfad481c5e48c26e7c529a2a6b\n"
    },
    {
      "commit": "0a2f151f37c715078351ae0be99b0c4dbabc2a23",
      "tree": "837f0234dd3a5836512f85971f72072a59167afe",
      "parents": [
        "00bbc1d5ee0ad847ed07a273d103e2996862e98b"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Jul 22 08:06:37 2016 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Jul 22 08:06:37 2016 -0700"
      },
      "message": "Fix AudioRecord::read and AudioTrack::write return\n\nvalue to only be one of the documented status codes.\n\nBug: 30158307\nChange-Id: If1ba16ce2ee10ba5ccb1674003a4b8fa086f27bc\n"
    },
    {
      "commit": "888de371da1b821975506c6013e2013ed6024e02",
      "tree": "ebf7b437aa53304863fb9eafea46205420bd21b1",
      "parents": [
        "e3caed1db3de38d1e60403101390392e77adf815",
        "e98f14ff194bd00ed71574cff19340c1090c78dd"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Fri Jul 15 06:11:36 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jul 15 06:11:36 2016 +0000"
      },
      "message": "Merge \\\"GenericSource: Allow multiple buffer reads for video\\\" into nyc-mr1-dev\nam: e98f14ff19\n\nChange-Id: I8348ecb645e1aef74064bacdbacd8de6c20e4d94\n"
    },
    {
      "commit": "e8d9d6d8ff2c229313ab7f079ae52445e8ee6b5a",
      "tree": "c00daa5723f09a50b5e9203486f32d6f829226f0",
      "parents": [
        "78ef32963c91d4c2e8d4e1cb361987b0438fc7f3",
        "83efe020b94d29132bd4d5cbe049a15abad0095a"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Fri Jul 15 03:37:20 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jul 15 03:37:20 2016 +0000"
      },
      "message": "Merge \\\"IMediaSource: Improve shared memory buffer transfer\\\" into nyc-mr1-dev\nam: 83efe020b9\n\nChange-Id: I20c727525eb2aa9d9858ee59d699c5ae8b81ef1f\n"
    },
    {
      "commit": "2d46f5972c0f7583a36e9df0c9622e91d6a1a5fd",
      "tree": "a05b5f54def2672e0f005718d5a505e06dc77145",
      "parents": [
        "a27b57921fa6e6333f6062c8416eaafa08ea08c1",
        "9a1a9537456e41cb8450f84a735c3d005a22ffe2"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Jul 14 01:14:07 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jul 14 01:14:07 2016 +0000"
      },
      "message": "MediaExtractor: add DrmInitialization in IDataSource.\nam: 9a1a953745\n\nChange-Id: Ib5a5b4c2989fb9688e53ad4251892b8a6b863f2b\n"
    },
    {
      "commit": "9a1a9537456e41cb8450f84a735c3d005a22ffe2",
      "tree": "511d4d0323b520205d0f4a136bc15b593b3d6b48",
      "parents": [
        "25d1b63b7cfbd0083ecd54c589f71664411f9b8c"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Jul 07 10:02:51 2016 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed Jul 13 23:23:50 2016 +0000"
      },
      "message": "MediaExtractor: add DrmInitialization in IDataSource.\n\nBug: 28901867\nChange-Id: Ic33dc8dc2f5f36239e057d2f2aceeb7738eef968\n(cherry picked from commit 2a5e49c984befa066e966cd9af2303a54976f163)\n"
    },
    {
      "commit": "cdeb6603d862cec4adac7c39f3b8b240f2b645dc",
      "tree": "839cc37ee4a36e37f7597fccdd7c927e1b314c3e",
      "parents": [
        "f59c0bafebcd795b20141bf928a5cab8ac46e882"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Jun 28 17:21:44 2016 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed Jul 13 12:38:46 2016 -0700"
      },
      "message": "GenericSource: Allow multiple buffer reads for video\n\nBug: 29125703\nChange-Id: I23490a65ad3968d7be561805c9fa742320b5c78a\n"
    },
    {
      "commit": "f59c0bafebcd795b20141bf928a5cab8ac46e882",
      "tree": "13148690f5bcc66bd17c56b4a0f4cd9f5d05b539",
      "parents": [
        "88bd73d9acf5011ef40122fa9a1b43195facbe07"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed Jun 15 17:59:30 2016 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed Jul 13 12:38:33 2016 -0700"
      },
      "message": "IMediaSource: Improve shared memory buffer transfer\n\nBug: 29125703\nChange-Id: Icf1180dee65f6504e6c10dd4d5b28a8e441f67d1\n"
    },
    {
      "commit": "464578df7725dc452b35466e469b35e6f39d8e8f",
      "tree": "0cedfd7f62bf2bff53016417a3746f199a3f887c",
      "parents": [
        "4bcec886d7a228bef86da16137571306751b99cd",
        "489eb9bfaa7803d1efb022d92eebbdb53d0e0b5f"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed Jul 13 02:07:45 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 13 02:07:45 2016 +0000"
      },
      "message": "Merge \\\"MediaExtractor: add DrmInitialization in IDataSource.\\\" into nyc-mr1-dev\nam: 489eb9bfaa\n\nChange-Id: I91208fea89388be02550c6c8b7a728dd9dd1ee31\n"
    },
    {
      "commit": "2a5e49c984befa066e966cd9af2303a54976f163",
      "tree": "305eb96568ad98fce4823326b48eaa9e085fe48b",
      "parents": [
        "e37b911fbf70c15c652db8585bca2a5f035d9def"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Jul 07 10:02:51 2016 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed Jul 13 00:11:07 2016 +0000"
      },
      "message": "MediaExtractor: add DrmInitialization in IDataSource.\n\nBug: 28901867\nChange-Id: Ic33dc8dc2f5f36239e057d2f2aceeb7738eef968\n"
    }
  ],
  "next": "38c26fba02e512c0391878eb6bfc2ed1a88443de"
}
