)]}'
{
  "log": [
    {
      "commit": "8cf3a0788df2ee184b498086b1b8da322eeadcca",
      "tree": "1bd36129bbd4afa491689deca23977dbf30930f6",
      "parents": [
        "a5ec8b0ec9c94fd9474fae1d1d1dc798ae6c4d2d"
      ],
      "author": {
        "name": "Ivan Lozano",
        "email": "ivanlozano@google.com",
        "time": "Wed Aug 09 09:01:33 2017 -0700"
      },
      "committer": {
        "name": "Ivan Lozano",
        "email": "ivanlozano@google.com",
        "time": "Fri Sep 01 10:14:30 2017 -0700"
      },
      "message": "Generate the IPlayer interface with AIDL.\n\nThis removes the manually rolled IPlayer implementation and instead uses\nan aidl generated implementation. The IPlayer aidl file is moved from\nframeworks/base/.\n\nTest: run cts --module CtsMediaTestCases\nBug: 64223827\nChange-Id: Ia609f7ba1cc6f71ce919d6174dd8b5e0e1b05575\n"
    },
    {
      "commit": "f9db68df36df4b6858a379e010ba69ec9328cfc7",
      "tree": "64c945648b42f3bdc4670e600308d30a1be105f6",
      "parents": [
        "1389cc47fc04ae8715e9a5b6ed48cd2131b4ad21",
        "6bc7d881814ae51ac1f98def9e65037e4608f3a8"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Thu Aug 10 03:47:03 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Aug 10 03:47:03 2017 +0000"
      },
      "message": "Merge \"stagefright: add HEIF support\" into oc-mr1-dev am: 97ab472f39\nam: 6bc7d88181\n\nChange-Id: I570804240719142ebb14ab279befe69b5852d67e\n"
    },
    {
      "commit": "97ab472f3921912748f1eb9e32d1aba25d853a33",
      "tree": "d2e0c2a449d1a0cf42c44ac3f8bd6b2e1bbe6ae2",
      "parents": [
        "c9f2e060b00b4c8bc0cea6cbdd80551551668808",
        "b51ca280e6aaace44ec1d80837439b825c6fce82"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu Aug 10 03:40:39 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Aug 10 03:40:39 2017 +0000"
      },
      "message": "Merge \"stagefright: add HEIF support\" into oc-mr1-dev"
    },
    {
      "commit": "b51ca280e6aaace44ec1d80837439b825c6fce82",
      "tree": "2b5b07364d40fb2a5e50e7ea17e6c907d2e46a16",
      "parents": [
        "24c15776247c46e34562100213035bb7aaffe013"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Jul 26 16:25:28 2017 -0700"
      },
      "committer": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Aug 09 16:20:35 2017 -0700"
      },
      "message": "stagefright: add HEIF support\n\n- add HEIF support in MPEG4Extractor.\n\n- decode HEIF image or tiled image in StagefrightMetadataRetriever\u0027s\n  getFrameAt() api and convert to requested color format.\n\nbug: 64077740\n\nTest: cts-tradefed run cts-dev --module CtsMediaTestCases --compatibility:module-arg CtsMediaTestCases:include-annotation:android.platform.test.annotations.RequiresDevice\n\nChange-Id: Id4b26f1584ca6219073ffb0167f208e1c3bf8aa2\n"
    },
    {
      "commit": "b407c3f337aae77fadf7f5442a5332a1619cf5c6",
      "tree": "be88e2404789ed7b604d13c677067be82c9efe09",
      "parents": [
        "5d6246b67b96ffff8baa393a03e136badd81d823",
        "215a490e267d75ba130fdbc865c631f2088db331"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed Aug 09 21:11:05 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Aug 09 21:11:05 2017 +0000"
      },
      "message": "Merge \"NuPlayerDecoder: check mCodec before dereferencing\" into oc-mr1-dev am: 298346c387\nam: 215a490e26\n\nChange-Id: I9806ff82c5bd94e7629d2f1950f721d740a5bf58\n"
    },
    {
      "commit": "298346c387e49ddaff94a7270b3791c0d40780fe",
      "tree": "7b2879c6582ab0cb8feb00eb93f7db939c4c4d12",
      "parents": [
        "e88fd530455d39e4c770870c74c1198820f62bfe",
        "fcd878748dc54cfc633562ced3fd6844477939c6"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed Aug 09 20:41:27 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Aug 09 20:41:27 2017 +0000"
      },
      "message": "Merge \"NuPlayerDecoder: check mCodec before dereferencing\" into oc-mr1-dev"
    },
    {
      "commit": "5d6246b67b96ffff8baa393a03e136badd81d823",
      "tree": "6ee2634d1e800ad125f516e107eb5f785d8a92d9",
      "parents": [
        "c2fcb6a193440d31e4722e2242fd888f5a72514c",
        "813ab3428fcb246f303b6a022cba096d88d8d735"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Aug 09 07:29:28 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Aug 09 07:29:28 2017 +0000"
      },
      "message": "Merge \"stagefright: MetadataRetriever API to specify mime and color format\" into oc-mr1-dev am: e88fd53045\nam: 813ab3428f\n\nChange-Id: Ia2459d8a1f8fa7ad9df85b7b8520afc04a6486db\n"
    },
    {
      "commit": "24c15776247c46e34562100213035bb7aaffe013",
      "tree": "3eb89bc53d5fab0a123ecae17400985eb43077de",
      "parents": [
        "026d520295b52d136a6962a05882a696fe620725"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Jul 26 16:25:28 2017 -0700"
      },
      "committer": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Tue Aug 08 16:52:10 2017 -0700"
      },
      "message": "stagefright: MetadataRetriever API to specify mime and color format\n\n- Allow setDataSource() to specify mime. In case of HEIF decoding\n  request from skia, we don\u0027t want to sniff any other format other\n  than mp4.\n\n- Allow getFrameAtTime() to specify dst color format.\n\nbug: 64077740\n\nTest: cts-tradefed run cts-dev --module CtsMediaTestCases --compatibility:module-arg CtsMediaTestCases:include-annotation:android.platform.test.annotations.RequiresDevice\n\nChange-Id: I471f41c28a2252417c4b3331dcfd4bd00a24408a\n"
    },
    {
      "commit": "fcd878748dc54cfc633562ced3fd6844477939c6",
      "tree": "43e7ea92164ea57de42144e21871a3647be32379",
      "parents": [
        "2eddd660f9140d50f4e49e7981580dee2356ff54"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Jul 28 15:50:04 2017 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Aug 08 13:02:03 2017 -0700"
      },
      "message": "NuPlayerDecoder: check mCodec before dereferencing\n\nTest: decoder does not crash when configure failed.\nBug: 25165051\nChange-Id: I0f8fae44cca0938ad8ff862c9b5b3b2c8ad396a2\n"
    },
    {
      "commit": "d3dcd248994aa922de9f129f5e6b39bc2d26018a",
      "tree": "2f86b449543e2ac4d0d42765da96a3eade966e0b",
      "parents": [
        "5a76cab253271ee647022eaae85980a777c67970",
        "c7170f20a5f1ce9b29a8719f717d3ae72ab331b9"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Tue Aug 01 03:06:07 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Aug 01 03:06:07 2017 +0000"
      },
      "message": "Merge \"GenericSource: reset timed text/subtitle after seek\" into oc-dr1-dev am: 87b901caa1 am: 93d85e7929\nam: c7170f20a5\n\nChange-Id: I638507d1b2e2466b9ae58236d4df939609b1a1a3\n"
    },
    {
      "commit": "c7170f20a5f1ce9b29a8719f717d3ae72ab331b9",
      "tree": "ebcf2d5928078fbd3b79081b86790204b2c9853f",
      "parents": [
        "3b6654815fa29bbb9487b13a5f3f66267cbbb831",
        "93d85e7929ce290983984faf1b245d06c1b13a06"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Tue Aug 01 02:44:01 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Aug 01 02:44:01 2017 +0000"
      },
      "message": "Merge \"GenericSource: reset timed text/subtitle after seek\" into oc-dr1-dev am: 87b901caa1\nam: 93d85e7929\n\nChange-Id: I1106b56d1868b2895b8829235f95d953991b0549\n"
    },
    {
      "commit": "4af61ddad5cb18b08fa4faa956468363e30f3b1c",
      "tree": "657d75e9ccb34099f943dc95e3cc61261233d361",
      "parents": [
        "b313c5c751d695e27a5eb0b8491b34bf2e2f8682",
        "87b901caa18f2e5e5a39023fb682eb09d4d832fe"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Tue Aug 01 02:41:01 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Aug 01 02:41:01 2017 +0000"
      },
      "message": "Merge \"GenericSource: reset timed text/subtitle after seek\" into oc-dr1-dev\nam: 87b901caa1\n\nChange-Id: I643afacd79bd58c7acf1873db0cd1b01f09089b9\n"
    },
    {
      "commit": "93d85e7929ce290983984faf1b245d06c1b13a06",
      "tree": "8125fa2fb1f8b841d66b6cfb7d671a41d8bbf8d9",
      "parents": [
        "47fb8a5163e01c62f1a5071ad6bcbf4afd7d48be",
        "87b901caa18f2e5e5a39023fb682eb09d4d832fe"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Tue Aug 01 02:41:01 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Aug 01 02:41:01 2017 +0000"
      },
      "message": "Merge \"GenericSource: reset timed text/subtitle after seek\" into oc-dr1-dev\nam: 87b901caa1\n\nChange-Id: I004617ccc72bec5e8c4270fc2991eab650e2ff6d\n"
    },
    {
      "commit": "87b901caa18f2e5e5a39023fb682eb09d4d832fe",
      "tree": "eca9bc7b6e64e374ff5f45e948259ae13818ddac",
      "parents": [
        "a2208f7d01fefd9f402781ab24264b6732d6e934",
        "4029672a3533597ea2a7aaa7b17a45674bc70e85"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Tue Aug 01 02:37:44 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Aug 01 02:37:44 2017 +0000"
      },
      "message": "Merge \"GenericSource: reset timed text/subtitle after seek\" into oc-dr1-dev"
    },
    {
      "commit": "4029672a3533597ea2a7aaa7b17a45674bc70e85",
      "tree": "2b70e4599f19e2ea7cbbd553274610f3a8b928a2",
      "parents": [
        "b2bae26bf4f537973fcfe4cc620044de3044b525"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Mon Jul 31 16:44:39 2017 -0700"
      },
      "committer": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Mon Jul 31 17:31:24 2017 -0700"
      },
      "message": "GenericSource: reset timed text/subtitle after seek\n\nBug: 62071488\nTest: MediaPlayerTest#testSeekWithTimedText\nChange-Id: I789c22d186a601d57b4d5ad0d7945590714796a3\n"
    },
    {
      "commit": "77f4d8b90c35af78ff80a56a5d36a1123daffac3",
      "tree": "bd4c6bd622917019fcccbe652daa943e3b8ae7c7",
      "parents": [
        "1b491fdbe57a4e2256768c57ce39b66ab4b4e5b8",
        "4b8ef498ccc3dd52f4d1f86bb84e9fc49dd4cc46"
      ],
      "author": {
        "name": "Pawin Vongmasa",
        "email": "pawin@google.com",
        "time": "Thu Jul 27 04:29:26 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jul 27 04:29:26 2017 +0000"
      },
      "message": "Merge \"Organize header dependencies\" into oc-mr1-dev am: 1ec73bea63\nam: 4b8ef498cc\n\nChange-Id: I14258dde43a0dd0ad18e25970948418f19325339\n"
    },
    {
      "commit": "1ec73bea63577c13de6c9373d555c5e4523f3026",
      "tree": "88e27c9f19f77e6c7ee0290bfb26cae7829c5586",
      "parents": [
        "25bae7bb6f4737bc78891eaaade5bdd01178dbd9",
        "255735a38b9d5c3755c7b819bdc8fdaf4357d860"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu Jul 27 04:13:32 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Jul 27 04:13:32 2017 +0000"
      },
      "message": "Merge \"Organize header dependencies\" into oc-mr1-dev"
    },
    {
      "commit": "28e6c5fc5683e34c9c008a13246e69f0431833df",
      "tree": "1cac9fa44485726e5aaaf7309430f72926976c1f",
      "parents": [
        "0fbeb4d09d2b65004d3a7f9828e114cdd7666386",
        "89dc2fe68646a16ee21a02ce2b6610bbf3262ade"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed Jul 26 22:02:49 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Jul 26 22:02:49 2017 +0000"
      },
      "message": "Merge \"GenericSource: still feed audio decoder when paused.\""
    },
    {
      "commit": "255735a38b9d5c3755c7b819bdc8fdaf4357d860",
      "tree": "f1c83bce136d5f122f57dc3281ab9d5fa0597f05",
      "parents": [
        "5c2bdf6a7042d68f9ae2d2f58cf3bae1c44fcab9"
      ],
      "author": {
        "name": "Pawin Vongmasa",
        "email": "pawin@google.com",
        "time": "Wed Jul 19 11:24:56 2017 -0700"
      },
      "committer": {
        "name": "Pawin Vongmasa",
        "email": "pawin@google.com",
        "time": "Mon Jul 24 20:29:36 2017 -0700"
      },
      "message": "Organize header dependencies\n\nHeader files that are exported are moved to a specific place for\nexporting.\n\nTest: make cts -j123 \u0026\u0026 cts-tradefed run cts-dev -m \\\nCtsMediaTestCases --compatibility:module-arg \\\nCtsMediaTestCases:include-annotation:\\\nandroid.platform.test.annotations.RequiresDevice\nBug: 63821829\n\nChange-Id: Ia578e3c0dd1ff157335b3a49af896acb922586e8\n"
    },
    {
      "commit": "8e3c14dfdcd215f001ad8e15bf22ea499b739bbe",
      "tree": "696fb1c82886684a84123d654d5b8351bdd5ab78",
      "parents": [
        "78611d7da9283d999adc52126bd0888e94e7bd86",
        "db5beef4cf663e01dcdd65e953dc136b06ac81f4"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Jul 25 02:31:39 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 25 02:31:39 2017 +0000"
      },
      "message": "Merge \"MediaPlayer: Permit VolumeShaper operations on gapless playback\" into oc-dr1-dev\nam: db5beef4cf\n\nChange-Id: I421260233901525a17c4f3aa0ea1b10485f09852\n"
    },
    {
      "commit": "91b5eb2ffcb78fb4ac02abcebcb76c31b6e9bd9c",
      "tree": "dcd39fd91315383dce7883fc189fc70dc3f300ff",
      "parents": [
        "5c2bdf6a7042d68f9ae2d2f58cf3bae1c44fcab9",
        "db5beef4cf663e01dcdd65e953dc136b06ac81f4"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Jul 25 02:31:38 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 25 02:31:38 2017 +0000"
      },
      "message": "Merge \"MediaPlayer: Permit VolumeShaper operations on gapless playback\" into oc-dr1-dev\nam: db5beef4cf\n\nChange-Id: Ifeac95fa06d0160abf2215b84321be4a8823e31b\n"
    },
    {
      "commit": "c01eddb86e01eedc8baca1ad1768c942387b33a8",
      "tree": "1688a3e7653090b02c76a0d61d5424629be5253d",
      "parents": [
        "ef00a24944032e3fcdaef43f81fea87e6297eacf"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Fri Jul 21 16:42:41 2017 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Mon Jul 24 21:43:28 2017 +0000"
      },
      "message": "MediaPlayer: Permit VolumeShaper operations on gapless playback\n\nThis allows unducking to occur when VolumeShaper operations\nare applied to the original player.\n\nTest: Automated duck tests\nBug: 63111689\nChange-Id: If2e93b1ccb11216032f24e71ab200668e1e4850d\n"
    },
    {
      "commit": "9af3fd5c98fe5652233058d945a50a2f9172891a",
      "tree": "9a4ea649860b32a9639d2c7cad9a8d19e2a794f4",
      "parents": [
        "c9bac6e40e62bac2bcffad79155757e4f1e9eb3e",
        "2e3ff09fc63762cb2c65118dc401231fa4a5757a"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 18 19:56:25 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 18 19:56:25 2017 +0000"
      },
      "message": "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384 am: 830ecba34d am: ee04f896ca am: b65bc512d1 am: 6b79fa9965 am: 650446e758\nam: 2e3ff09fc6\n\nChange-Id: Ib2faf4e77ec0f916932ef79388da20e93eae5ed5\n"
    },
    {
      "commit": "2e3ff09fc63762cb2c65118dc401231fa4a5757a",
      "tree": "22450653d13cb429a2d0f54eb263e0cf2f15281a",
      "parents": [
        "2a78bf88d45e211be626824096991f05cd11213b",
        "650446e7589cf063c369ffc7436e9196fbd9399a"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 18 19:53:23 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 18 19:53:23 2017 +0000"
      },
      "message": "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384 am: 830ecba34d am: ee04f896ca am: b65bc512d1 am: 6b79fa9965\nam: 650446e758\n\nChange-Id: I80ca91c7b13e441eb885287a3589f848ad910ba5\n"
    },
    {
      "commit": "29204646b945adf58390b7d06f2cb223d6b2c4c0",
      "tree": "c5b60a39527632652697686990040561f1d6ec8d",
      "parents": [
        "4f771e05dba8fc3f01ad2af4befe50f085e5f3fd",
        "6b79fa9965c73b2ff3e62cb832305ea93d8b3de4"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 18 19:51:24 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 18 19:51:24 2017 +0000"
      },
      "message": "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384 am: 830ecba34d am: ee04f896ca am: b65bc512d1\nam: 6b79fa9965\n\nChange-Id: I69819dad31186c037bd4d52280bf7b18c745a31f\n"
    },
    {
      "commit": "650446e7589cf063c369ffc7436e9196fbd9399a",
      "tree": "02402e1c53eb3df38f6c699e0a3444a15a808072",
      "parents": [
        "e68bb3371238e32e45cd3133a143f7a096aa9c2b",
        "6b79fa9965c73b2ff3e62cb832305ea93d8b3de4"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 18 19:51:24 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 18 19:51:24 2017 +0000"
      },
      "message": "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384 am: 830ecba34d am: ee04f896ca am: b65bc512d1\nam: 6b79fa9965\n\nChange-Id: I05c6510ddd4abd449e3bf75ec3d8ae8fdaa45917\n"
    },
    {
      "commit": "6b79fa9965c73b2ff3e62cb832305ea93d8b3de4",
      "tree": "d63ce212f95793d0ab034cf8ce266d411c80325f",
      "parents": [
        "dd36008b782ec1da0ded327dc51292d102c690d4",
        "b65bc512d15bc7234354ddc19815ebf24bea3a97"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 18 19:49:21 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 18 19:49:21 2017 +0000"
      },
      "message": "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384 am: 830ecba34d am: ee04f896ca\nam: b65bc512d1\n\nChange-Id: Id341ee30610d4c1e887a71b0deb1ddef3f325f48\n"
    },
    {
      "commit": "ee04f896ca56f1f578c011b1905582aa6c92a8c5",
      "tree": "f27a27851130ab466ca87a5862512ea722ed33ea",
      "parents": [
        "a5d728cce1d43536c56fffe919df19a897b95665",
        "830ecba34dc43cf5e0dad3dd0b37597400ef52b7"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 18 19:43:51 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 18 19:43:51 2017 +0000"
      },
      "message": "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384\nam: 830ecba34d\n\nChange-Id: Iac159cbf205fb02aa600d8b136e70b6d71b44924\n"
    },
    {
      "commit": "830ecba34dc43cf5e0dad3dd0b37597400ef52b7",
      "tree": "bc2e94801e3185d7547ebc4afce5246d5b825326",
      "parents": [
        "125fc63d73ea651f051c4b5c4b00fc35e43cacec",
        "6f7295a38455324f5da41d4e52d0ed0e2fc4b45f"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 18 19:40:51 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 18 19:40:51 2017 +0000"
      },
      "message": "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149\nam: 6f7295a384\n\nChange-Id: I7f6837cd4aced5a6d83aaf0279cc3908f80a4027\n"
    },
    {
      "commit": "6f7295a38455324f5da41d4e52d0ed0e2fc4b45f",
      "tree": "54f01c7f8f6d850b52276dff61468687b5795618",
      "parents": [
        "bd6594eaf2f01655b91c1a0e57ff82d39b9f0477",
        "d8192c9149430fcc7d618de6a239940bce62d4fa"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 18 19:39:21 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 18 19:39:21 2017 +0000"
      },
      "message": "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7\nam: d8192c9149\n\nChange-Id: I25ed67aa5671f7484dc99d3d79e0ed33125117f6\n"
    },
    {
      "commit": "d8192c9149430fcc7d618de6a239940bce62d4fa",
      "tree": "143836ec2b559ed6e70bef438c3ef2c73e864a35",
      "parents": [
        "e68844ffb058d7ead7392fea55db59a2a85aa6bf",
        "1a1bb632e754c9d2f07d1d98a51a072055a0b677"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 18 19:36:19 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 18 19:36:19 2017 +0000"
      },
      "message": "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44\nam: 1a1bb632e7\n\nChange-Id: I7cd886d0bbe96dcf8aafe082649d2a9a7c1c303e\n"
    },
    {
      "commit": "50280c1b44da60acf6f9cc3df8dc8e90db374d7c",
      "tree": "7bec8d1ad2b64f1c9663e1dd9afbbc68c0b70ab6",
      "parents": [
        "1feb9dca54f002ead236c432858e509383345a1d",
        "93ae13644bb8e2e1a7fbcb3c4dc1dd2c4eae57c5"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 18 19:30:50 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 18 19:30:50 2017 +0000"
      },
      "message": "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c\nam: 93ae13644b\n\nChange-Id: I16649e1417e36610e0731da5c47c90a9de169d13\n"
    },
    {
      "commit": "93ae13644bb8e2e1a7fbcb3c4dc1dd2c4eae57c5",
      "tree": "d1c80928b337a079566d21156524e4fa008d26e0",
      "parents": [
        "671c88a8077ca45d52122c14c324a78ff53f18aa",
        "5cc9f8780cc0e938f17254b9d7662d05edef2547"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 18 19:28:47 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 18 19:28:47 2017 +0000"
      },
      "message": "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584\nam: 5cc9f8780c\n\nChange-Id: Icb93a3b48a1674066fbf0b07bf11cda56ab22436\n"
    },
    {
      "commit": "5cc9f8780cc0e938f17254b9d7662d05edef2547",
      "tree": "cc6627048c2620dc2261e5cb602aaf04f543b6a9",
      "parents": [
        "3627617c2b7e268e961e1da433e2f452650964f6",
        "e0f496358416abebeb7ba971a354ec69cb1848d4"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 18 19:25:49 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 18 19:25:49 2017 +0000"
      },
      "message": "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8\nam: e0f4963584\n\nChange-Id: I318dd6a90b2af9c4e879e4ab47cfad110002532d\n"
    },
    {
      "commit": "0844e1a3e8d000f34ee5a9aa55c826f771fb971e",
      "tree": "30678681c0a807255262d122324bb444536f5411",
      "parents": [
        "b063a7ea183aec7c79d6b74eff72d7548df431ac",
        "263d5a2a7065ed5a674d2af408f75383d4a01898"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 18 19:20:19 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 18 19:20:19 2017 +0000"
      },
      "message": "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f\nam: 263d5a2a70\n\nChange-Id: I24e4ade61cbc0a03d20aa4b79b21fe18baa10e43\n"
    },
    {
      "commit": "263d5a2a7065ed5a674d2af408f75383d4a01898",
      "tree": "f7bcf5319d9b55e4faebe4ac7305bba5fef21d0e",
      "parents": [
        "8700c26a9184224d326a7c3dc018a9f412f6165d",
        "03fa67202fac9df24f9dbefa24c9f81f9f9e415d"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 18 19:12:37 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 18 19:12:37 2017 +0000"
      },
      "message": "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6\nam: 03fa67202f\n\nChange-Id: I9336683351fa531560fadbe554eb218fc663585f\n"
    },
    {
      "commit": "03fa67202fac9df24f9dbefa24c9f81f9f9e415d",
      "tree": "578507cd259fa4ae3ef585d7f76cdc348886615a",
      "parents": [
        "5445ddc9837f3632b26be730ec434a54da2d53ef",
        "bd7db202c69ccd28414bcda7bee6f5cae1236885"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 18 19:05:35 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 18 19:05:35 2017 +0000"
      },
      "message": "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053\nam: bd7db202c6\n\nChange-Id: If691af6c8d3c3849da52da943fd754ed9bd1fe0b\n"
    },
    {
      "commit": "89dc2fe68646a16ee21a02ce2b6610bbf3262ade",
      "tree": "ffa128381fbd2a1e12523553165e990f94fbcfba",
      "parents": [
        "f34e3f272d9ca267b73188ec7cb6c40ef27682ec"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 18 11:00:40 2017 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 18 11:00:40 2017 -0700"
      },
      "message": "GenericSource: still feed audio decoder when paused.\n\nTest: audio decoder stops polling source\nBug: 63412809\nChange-Id: I53c98920ea850defae88b2e12be6b05d6d90c32c\n"
    },
    {
      "commit": "502c2f405355c3253990ac4edae345ac1907f916",
      "tree": "71cb549d0c161a299ad8b3ab4832501963bfbd5b",
      "parents": [
        "da84963c1f4482be7570b68293906e6cc61200bd"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Jul 13 17:47:56 2017 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Mon Jul 17 23:26:10 2017 +0000"
      },
      "message": "MediaPlayerService: fix access of mPlayer in client\n\nTest: poc doesn\u0027t crash\nBug: 38234812\nChange-Id: I6f9be046ff66d2d5bed27bd712287e4ead550830\n"
    },
    {
      "commit": "599e95afa2c717caea823c3fd330eaaebf54880c",
      "tree": "629cdebdaa29c2bb115524a1913cc554a4ab0de6",
      "parents": [
        "2ca3dd3338d861ad844306c6efdbc57510671dfe",
        "d214a56215f01f2d4f4ac17cc842a1d63e146126"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Fri Jul 14 20:57:05 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Jul 14 20:57:05 2017 +0000"
      },
      "message": "Merge \"NuPlayerRenderer: allow video to continue when audio ends\""
    },
    {
      "commit": "a4421734be296058671dc7ac4bd5a3d0de044b32",
      "tree": "0413f3c13fc34ddec2559229348a93e6ab3e849b",
      "parents": [
        "e75d99fbc8b026f9fa2c10ccb5ddfc2847465945",
        "f86731d6a5d7392bb600123af2843687f6aa9c2e"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed Jul 12 22:27:48 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Jul 12 22:27:48 2017 +0000"
      },
      "message": "Merge \"NuPlayer: fix track error notification\""
    },
    {
      "commit": "f86731d6a5d7392bb600123af2843687f6aa9c2e",
      "tree": "9ecdc3a984e9d93b5186c0a1d9f7dc9ecb7b2e9d",
      "parents": [
        "f34e3f272d9ca267b73188ec7cb6c40ef27682ec"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 11 17:24:34 2017 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 11 17:24:34 2017 -0700"
      },
      "message": "NuPlayer: fix track error notification\n\nAudio/video decoder could have been shut down due to error. When the\ncounter track has error, it should take this into consideration.\nTest: MediaPlayer sends out corrent error notification.\nBug: 63116575\n\nChange-Id: Ie31d4e6d9b2bc6715d657a4c8e2dc7c1368257b1\n"
    },
    {
      "commit": "20e6916035865710b7a30ac7f2eac1311e2c2e70",
      "tree": "dd8d338def2cf05278625a09551978faa6f8a6a7",
      "parents": [
        "8a9f420455f8fd5b97910747416582eea5a1c29f",
        "31dcf0154d4ba4650915987b666a6cea0048339d"
      ],
      "author": {
        "name": "Yunlian Jiang",
        "email": "yunlian@google.com",
        "time": "Wed Jul 12 00:12:20 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 12 00:12:20 2017 +0000"
      },
      "message": "Merge \"Fix memory leak warning.\" am: ae6088e456 am: 37cd5f116d am: 4c09f57e62\nam: 31dcf0154d\n\nChange-Id: Ief95861362c2ed6146c12c2b1570024dbde49269\n"
    },
    {
      "commit": "31dcf0154d4ba4650915987b666a6cea0048339d",
      "tree": "07982efd6b01b2fdfb3b346f506a56ef1a8fbfc2",
      "parents": [
        "9f2b9d3a001834c1e1990ac8e2a8717ad38c7eee",
        "4c09f57e628bcbdf04f976d83c4fa424c5035e5d"
      ],
      "author": {
        "name": "Yunlian Jiang",
        "email": "yunlian@google.com",
        "time": "Wed Jul 12 00:08:48 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 12 00:08:48 2017 +0000"
      },
      "message": "Merge \"Fix memory leak warning.\" am: ae6088e456 am: 37cd5f116d\nam: 4c09f57e62\n\nChange-Id: Ie864652e4f5344d50e68ede6aa23b021b1ee84c1\n"
    },
    {
      "commit": "37cd5f116dfbde69be3625e7a2112346393b0ef1",
      "tree": "43a3f49b6b7ec15861b2143355cae531fe1fb636",
      "parents": [
        "0377dccbf8220c4d5d02892fa30911957c0e7a0b",
        "ae6088e4563a4503df06566accda7e21f0ccdf0e"
      ],
      "author": {
        "name": "Yunlian Jiang",
        "email": "yunlian@google.com",
        "time": "Wed Jul 12 00:01:48 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 12 00:01:48 2017 +0000"
      },
      "message": "Merge \"Fix memory leak warning.\"\nam: ae6088e456\n\nChange-Id: I3dff126ce299da44030ae92822f48e34e9693a55\n"
    },
    {
      "commit": "d214a56215f01f2d4f4ac17cc842a1d63e146126",
      "tree": "5a1efbf660952ba998b2d7a14cf2499ee2c30082",
      "parents": [
        "f34e3f272d9ca267b73188ec7cb6c40ef27682ec"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Mon Jul 10 13:20:55 2017 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Mon Jul 10 13:20:55 2017 -0700"
      },
      "message": "NuPlayerRenderer: allow video to continue when audio ends\n\nTest: video can continue when audio ends\nBug: 63397228\nChange-Id: Iebd79006b7205ddd4d616a803fe0e5f492cbc866\n"
    },
    {
      "commit": "449d3f08148ac73f5cf7e2464a3faec1eba42f6c",
      "tree": "adafd303faae43450a84ba2db749e4b0202987ba",
      "parents": [
        "66688d8836830d742dd52dffabbf6c26bd16ad94"
      ],
      "author": {
        "name": "Yunlian Jiang",
        "email": "yunlian@google.com",
        "time": "Tue Jun 27 15:51:41 2017 -0700"
      },
      "committer": {
        "name": "Yunlian Jiang",
        "email": "yunlian@google.com",
        "time": "Wed Jun 28 11:34:08 2017 -0700"
      },
      "message": "Fix memory leak warning.\n\nThis CL eliminates the following compiler warning:\n\nMediaPlayerFactory.cpp:249:27: warning: Potential memory leak\n\nBug: None\nTest: After this change the warning is gone.\nChange-Id: I09e7ec5cc3bc84decfea2456550b532aac55d26f\n"
    },
    {
      "commit": "ddd11adcd9e44b0536d9eeb758b0672eec0439dc",
      "tree": "667d8bb98ca3f4a951e845d7038b0bfe291050a1",
      "parents": [
        "96521b2b71efb194315277a520cb06e4ade7187a"
      ],
      "author": {
        "name": "Santhosh Behara",
        "email": "santhoshbehara@codeaurora.org",
        "time": "Tue Jun 13 15:01:35 2017 +0530"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Jun 23 14:19:55 2017 -0700"
      },
      "message": "media: Change the location of dumping stats\n\nThe latest photos apk calls the setVideoSurfaceTexture\nwith a null bufferProducer. Hence the surface is set as\nNULL.\nDue to this, the video decoder is shutdown before the\nsurface is set. Hence the stats are lost. Thus when the\napp calls reset after surface is set, the stats are not\nprinted.\n\nTest: see dump stats\nCRs-Fixed: 2063273\n\nBug: 62897827\n\nAuthor: anubhavp@codeaurora.org\n\nChange-Id: Iafc09c50840960be4a20e55b34d5d31ba6a2da49\n(cherry picked from commit 563acd6f5a0bfc0174aee61a9ec04916fc227f14)\n"
    },
    {
      "commit": "8818bf1fbb9ea6b65cd61543ed7db986c3d65d13",
      "tree": "c94883f411415c3836f3bfc479e68b4bfa73f217",
      "parents": [
        "1f7d80772cf76eb6373e91039ceb2800ad7af378"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Jan 07 16:03:03 2016 -0800"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed Jun 07 17:44:16 2017 +0000"
      },
      "message": "DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can\u0027t be held in allocated buffer.\n\nBug: 38391487\nBug: 24145279\nChange-Id: I6b99ee2dc63063557f4ee2c5856f7c848e969752\n(cherry picked from commit 56097a8ecc31ec308a1caa38f92b69f99324eada)\n"
    },
    {
      "commit": "ba97351e6bb74f9632d8e4a8be92b1d4c526ae11",
      "tree": "c34aaadfc740e58fe9853f66bf5f80d897c3c35f",
      "parents": [
        "cfd9b9b85a7af2db0670ab98045558d35d530e16",
        "333b2d578a98941a41e258241b48e1702df376e1"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jun 06 19:51:41 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jun 06 19:51:41 2017 +0000"
      },
      "message": "Merge \"NuPlayerDecoder: fail gracefully when input data can\u0027t be held in allocated buffer.\" into lmp-mr1-dev am: 3b1a9c3f1b am: 2675f4cac9 am: 6a2a5b5808\nam: 333b2d578a\n\nChange-Id: I33e279617987ea8e577b06ce8666825f0c6f5ca5\n"
    },
    {
      "commit": "333b2d578a98941a41e258241b48e1702df376e1",
      "tree": "a82c370c66d573588a60e173b0335e1a723dbc33",
      "parents": [
        "e138ca8b828157782db5b8c2a3c58cabc1a487ac",
        "6a2a5b5808fc4b816f1966362270bf8e0487b428"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jun 06 19:46:11 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jun 06 19:46:11 2017 +0000"
      },
      "message": "Merge \"NuPlayerDecoder: fail gracefully when input data can\u0027t be held in allocated buffer.\" into lmp-mr1-dev am: 3b1a9c3f1b am: 2675f4cac9\nam: 6a2a5b5808\n\nChange-Id: Ic443f079bcb1213921a3bf61a13dbfe83ce2a63e\n"
    },
    {
      "commit": "6a2a5b5808fc4b816f1966362270bf8e0487b428",
      "tree": "057e01a880eb416b05f0a171f1786e93c5b088f9",
      "parents": [
        "16531bf6871663698091925c62e6a18b5d5f9c2b",
        "2675f4cac93ee3913512d917468aba67ac6b210a"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jun 06 19:39:39 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jun 06 19:39:39 2017 +0000"
      },
      "message": "Merge \"NuPlayerDecoder: fail gracefully when input data can\u0027t be held in allocated buffer.\" into lmp-mr1-dev am: 3b1a9c3f1b\nam: 2675f4cac9\n\nChange-Id: Ia5f63cef5ead1153656f38b34ac4bc8ebb12ca59\n"
    },
    {
      "commit": "14972ed9c95d2ba24f7f49a0580c336fa478bd10",
      "tree": "8f8808cb74f597e3e6679abe91e6146baf80e326",
      "parents": [
        "9e8f432a99d78191a42ffc070230d34ebf77102d",
        "360abaf9d7045bb125e0df414e82af1ef89681d0"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Mon Jun 05 19:04:00 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Jun 05 19:04:00 2017 +0000"
      },
      "message": "Merge \"Modular DRM for MediaPlayer: L3 playback fails at OMX mmap; preparDrm preparing\" into oc-dev am: 8631fd7b27\nam: 360abaf9d7\n\nChange-Id: Ib7dfcf5b854219276246bd6129bf2a0311990bde\n"
    },
    {
      "commit": "360abaf9d7045bb125e0df414e82af1ef89681d0",
      "tree": "75c1764562c54d7f46d2255c1e82e05496f20e09",
      "parents": [
        "88e94d3c1e3644d1c36b9e9c2f161cfe891ce4e1",
        "8631fd7b270e99ebee6ba056f4edd38e6bd4f93f"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Mon Jun 05 18:53:29 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Jun 05 18:53:29 2017 +0000"
      },
      "message": "Merge \"Modular DRM for MediaPlayer: L3 playback fails at OMX mmap; preparDrm preparing\" into oc-dev\nam: 8631fd7b27\n\nChange-Id: I88c8b84a400df2ed20e4e2017309634d8a725af4\n"
    },
    {
      "commit": "8631fd7b270e99ebee6ba056f4edd38e6bd4f93f",
      "tree": "dba08a8301476a0be1c971b9975f019216a74fcf",
      "parents": [
        "1d32e9f8e5ba52d69c6319270c8a63a995d2c4f2",
        "838be3907fc58eab119d7093a3d73be7267bd4d2"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Mon Jun 05 18:44:48 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Jun 05 18:44:50 2017 +0000"
      },
      "message": "Merge \"Modular DRM for MediaPlayer: L3 playback fails at OMX mmap; preparDrm preparing\" into oc-dev"
    },
    {
      "commit": "838be3907fc58eab119d7093a3d73be7267bd4d2",
      "tree": "a669b7f03ce3ca7799aa7311240a49d0846c6755",
      "parents": [
        "0375da69b221b05c3e44c49b1ad2f3b93a6bf2f9"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Tue May 23 14:14:24 2017 -0700"
      },
      "committer": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Thu Jun 01 12:21:03 2017 -0700"
      },
      "message": "Modular DRM for MediaPlayer: L3 playback fails at OMX mmap; preparDrm preparing\n\nBug: 34559906\nBug: 38390836\nBug: 38039230\nBug: 62194380\n\nTest: GTS Tests\nChange-Id: I51e2479f745a4c3e271628abdd79efcb97368ec2\n"
    },
    {
      "commit": "0094fd70678b901b8ffd92bc4a15c272f9ce28f0",
      "tree": "beab53f4d02fd0fb583ebdaf651d3dc2aafbd7e8",
      "parents": [
        "d2b26cd85d54b5258bfd0296313c07e80bee1957"
      ],
      "author": {
        "name": "YOUNG HO CHA",
        "email": "ganadist@gmail.com",
        "time": "Thu May 25 23:16:51 2017 +0900"
      },
      "committer": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Fri May 26 21:49:52 2017 +0000"
      },
      "message": "Android.mk: remove $TOP in LOCAL_C_INCLUDES\n\nTest: make systemimage\n\nChange-Id: I5f83786afe3f2c65819b127b041cb74fc4c989ac\nMerged-In: I5f83786afe3f2c65819b127b041cb74fc4c989ac\nSigned-off-by: YOUNG HO CHA \u003cganadist@gmail.com\u003e\n(cherry picked from commit 2ee7aab4a39139a86a24ca14f718eb20a1b355db)\n"
    },
    {
      "commit": "080a39e4877b4636e785d6652b407af8b78101a9",
      "tree": "d9fb636961972f4ea945410a8cc92a087309f3d0",
      "parents": [
        "c77b3bb4e11dd53028616454744b783a84f219de",
        "2ee7aab4a39139a86a24ca14f718eb20a1b355db"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Fri May 26 21:49:32 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri May 26 21:49:33 2017 +0000"
      },
      "message": "Merge \"Android.mk: remove $TOP in LOCAL_C_INCLUDES\""
    },
    {
      "commit": "2ee7aab4a39139a86a24ca14f718eb20a1b355db",
      "tree": "1a7501567d6af64aa958f26453ee9360833bfd4a",
      "parents": [
        "bcbc56bfd43e071cf8b199e9e6dfc835d1f29ab6"
      ],
      "author": {
        "name": "YOUNG HO CHA",
        "email": "ganadist@gmail.com",
        "time": "Thu May 25 23:16:51 2017 +0900"
      },
      "committer": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Thu May 25 11:26:52 2017 -0700"
      },
      "message": "Android.mk: remove $TOP in LOCAL_C_INCLUDES\n\nTest: make systemimage\n\nChange-Id: I5f83786afe3f2c65819b127b041cb74fc4c989ac\nSigned-off-by: YOUNG HO CHA \u003cganadist@gmail.com\u003e\n"
    },
    {
      "commit": "b3cd253a09623faba347dcc071d89159f8401c15",
      "tree": "4a302f4972d38d8ea27263b6d9ccaf4d4c6da21a",
      "parents": [
        "0b9bb5e2d1dd8c0b9dab065731706f043e9484ea"
      ],
      "author": {
        "name": "YOUNG HO CHA",
        "email": "ganadist@gmail.com",
        "time": "Thu May 25 23:16:51 2017 +0900"
      },
      "committer": {
        "name": "YOUNG HO CHA",
        "email": "ganadist@gmail.com",
        "time": "Thu May 25 23:18:30 2017 +0900"
      },
      "message": "Android.mk: remove $TOP in LOCAL_C_INCLUDES\n\nTest: make systemimage\n\nChange-Id: I5f83786afe3f2c65819b127b041cb74fc4c989ac\nSigned-off-by: YOUNG HO CHA \u003cganadist@gmail.com\u003e\n"
    },
    {
      "commit": "6e899bb13f7e9f58e3870bb622e0093c335f4896",
      "tree": "505c9bd469d4eb97c4834183e0f38e8fba32ce96",
      "parents": [
        "f6c19a19e494cd21c923b25e5d05892235f134dd",
        "8eed27bece03299d70d7a1acbc77236a192e7fe5"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Wed May 24 19:23:38 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 24 19:23:38 2017 +0000"
      },
      "message": "Merge \"Modular DRM for MediaPlayer/Fixing legacy frame drop at NuPlayerDecoder\" into oc-dev am: b7b6818b73\nam: 8eed27bece\n\nChange-Id: I0ea118ac1f355a0c1f283005f254f530a6fb21e3\n"
    },
    {
      "commit": "8eed27bece03299d70d7a1acbc77236a192e7fe5",
      "tree": "779b88bb86216339da43e3670d53a45fb145a303",
      "parents": [
        "67618464bab2ef84786ac40ca846d23eca50b0bc",
        "b7b6818b7397eb44b3d43175afdd9a4fd71f2cd4"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Wed May 24 19:20:08 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 24 19:20:08 2017 +0000"
      },
      "message": "Merge \"Modular DRM for MediaPlayer/Fixing legacy frame drop at NuPlayerDecoder\" into oc-dev\nam: b7b6818b73\n\nChange-Id: I601ddcab5011a7fd56b74df51ec5ac459f6ccb53\n"
    },
    {
      "commit": "62dec9555ec832b1a8c63c70e4df745aa8635488",
      "tree": "94de207630ccca1a5d147f18cca4cbd31fab5ab3",
      "parents": [
        "0556a2363ff5eb49bd35dc47f2d34cc2042de052"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Thu May 18 10:45:27 2017 -0700"
      },
      "committer": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Tue May 23 17:43:47 2017 -0700"
      },
      "message": "Modular DRM for MediaPlayer/Fixing legacy frame drop at NuPlayerDecoder\n\nBug: 34559906\nBug: 38039230\nBug: 38430289\nTest: GTS/CTS Tests\nChange-Id: I68dca5f8bae4f9f7866cfaaa6aba97c80dcd8ffb\n"
    },
    {
      "commit": "15c3740aa96df30049b7acf9d7dce77bbcf9d9d4",
      "tree": "2e1fbb786a8146d52f9b14494bea67431e9cbdeb",
      "parents": [
        "4bd7103388c9f76dccc78eb6a3120fa630a00250"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Jan 07 16:03:03 2016 -0800"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed May 17 23:39:29 2017 +0000"
      },
      "message": "NuPlayerDecoder: fail gracefully when input data can\u0027t be held in allocated buffer.\n\nBug: 38391487\nBug: 24145279\nChange-Id: I6b99ee2dc63063557f4ee2c5856f7c848e969752\n(cherry picked from commit 56097a8ecc31ec308a1caa38f92b69f99324eada)\n"
    },
    {
      "commit": "0e39f08a8560ec9d27786ab282b060739f341bf5",
      "tree": "1177f3f7ccc05a12be0e33e7fa01fde9ce5c6d95",
      "parents": [
        "3160d5702d4152430104728ec754e3a61a40bb1d",
        "b69caa46e844d5131b3f97f4485c3293cdf9ebde"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Tue May 16 16:20:23 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue May 16 16:20:23 2017 +0000"
      },
      "message": "Merge \"Modular DRM for MediaPlayer/Race at stop/releaseDrm\" into oc-dev am: a666b69800\nam: b69caa46e8\n\nChange-Id: I8b0b76d498caa7c8ed7bc9008127a02f4236c399\n"
    },
    {
      "commit": "b69caa46e844d5131b3f97f4485c3293cdf9ebde",
      "tree": "45dd316437dc0650436d483448528a9caada78de",
      "parents": [
        "41e635dcce18df7af6d5d14804bbac028bde6648",
        "a666b6980027946c2dfeb8a3529c8e791fc279a4"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Tue May 16 16:17:17 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue May 16 16:17:17 2017 +0000"
      },
      "message": "Merge \"Modular DRM for MediaPlayer/Race at stop/releaseDrm\" into oc-dev\nam: a666b69800\n\nChange-Id: I9a7d62c2e199bc33dd0677d54647d4d9be02893a\n"
    },
    {
      "commit": "355e8473df4a5b197f0cf136edfbede586416067",
      "tree": "f861410f2a1713975b0849d06f0036e0fdbdec29",
      "parents": [
        "d004c157bac96c4a180604bf304e0dbdb8bc11b5"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Fri May 12 10:33:16 2017 -0700"
      },
      "committer": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Mon May 15 18:36:20 2017 -0700"
      },
      "message": "Modular DRM for MediaPlayer/Race at stop/releaseDrm\n\nBug: 34559906\nBug: 37960096\nTest: GTS LLAMA_H264_XX_V0_SYNC (1000 rounds)\nChange-Id: I8576fb9dadf8922c2a54f2ea9e199d2e07c1820e\n"
    },
    {
      "commit": "d77d6dcad7255951e18767b63964ffd8ea8f81ae",
      "tree": "b2b16b324e0d53ec7a45388f20bea356f8fe0c41",
      "parents": [
        "4392ed13542dbcd8dd650b8d09273584fb3979da",
        "c97b068fbda412605497c56498be1e47ff6f955d"
      ],
      "author": {
        "name": "Ray Essick",
        "email": "essick@google.com",
        "time": "Sat May 13 01:39:34 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sat May 13 01:39:34 2017 +0000"
      },
      "message": "Merge \"Suppress empty media.metrics records from nuplayer\" into oc-dev am: feb0d87f69\nam: c97b068fbd\n\nChange-Id: Ibbfd9d58c25b53879596b1eab878320b419a6470\n"
    },
    {
      "commit": "c97b068fbda412605497c56498be1e47ff6f955d",
      "tree": "5fe08ce8229aa46cec0176258c5470cad1e5072a",
      "parents": [
        "8f4b21a004761e8ac066e2e17dfd47d2189402fe",
        "feb0d87f693abd8fd2fa7ebfcdf7d91f0b95c131"
      ],
      "author": {
        "name": "Ray Essick",
        "email": "essick@google.com",
        "time": "Sat May 13 01:37:21 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sat May 13 01:37:21 2017 +0000"
      },
      "message": "Merge \"Suppress empty media.metrics records from nuplayer\" into oc-dev\nam: feb0d87f69\n\nChange-Id: I92792befd7909fc873114c69b10ae832ed0bb31e\n"
    },
    {
      "commit": "feb0d87f693abd8fd2fa7ebfcdf7d91f0b95c131",
      "tree": "25a0b212ba20065aa47b5257550e7aefeae58434",
      "parents": [
        "8467c128d7edfc16a93e2606bbae5188f067d2d5",
        "3991809be9c81daec6293f5a099a6ce040090aed"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Sat May 13 01:31:02 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Sat May 13 01:31:03 2017 +0000"
      },
      "message": "Merge \"Suppress empty media.metrics records from nuplayer\" into oc-dev"
    },
    {
      "commit": "3991809be9c81daec6293f5a099a6ce040090aed",
      "tree": "3aa084ae3a63d44d0fa359a62552fddba029ee86",
      "parents": [
        "24fd2f7d2900797b1300d6bc89d28bd94a31c3cb"
      ],
      "author": {
        "name": "Ray Essick",
        "email": "essick@google.com",
        "time": "Fri May 12 16:22:05 2017 -0700"
      },
      "committer": {
        "name": "Ray Essick",
        "email": "essick@google.com",
        "time": "Fri May 12 16:22:05 2017 -0700"
      },
      "message": "Suppress empty media.metrics records from nuplayer\n\ntweaks the mechanism (a count) we use to suppress nuplayer records\nfor media.metrics to reflect recent changes that included datasource\ninformation.\n\nThis stops spurious records that pollute / degrade the uploaded\nmetrics data.\n\nBug: 38270725\nTest: examine output from: dumpsys media.metrics\n"
    },
    {
      "commit": "12e249804d3c03f3716b55607ca4da057bbd7e50",
      "tree": "d8a3a3ddd67306ed882fe7a9094c90db3f869b64",
      "parents": [
        "f17b95bf5e964f9a2e440e2a2763c04b4b6b72d0",
        "5ef9ab98a92462e2c1312ec2554fab7ff625589f"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Thu May 11 21:29:35 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu May 11 21:29:35 2017 +0000"
      },
      "message": "Merge \"stagefright: put battery update under a separate lock\" into oc-dev am: a387a6cc1e\nam: 5ef9ab98a9\n\nChange-Id: I690de00b95d0ae22394dbd85aae8a6624c2fa69b\n"
    },
    {
      "commit": "5ef9ab98a92462e2c1312ec2554fab7ff625589f",
      "tree": "5ab6802676ac2c73e7458ada123bed1a384b4bc1",
      "parents": [
        "5f16993298d62f0e3f9497c1a828b88213c4cb32",
        "a387a6cc1e97f26eb6847ed5cf3d2a6b4cf25cb0"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Thu May 11 21:22:14 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu May 11 21:22:14 2017 +0000"
      },
      "message": "Merge \"stagefright: put battery update under a separate lock\" into oc-dev\nam: a387a6cc1e\n\nChange-Id: I127eaa93bd4fb9b1849b548c5c246035cb59b8c9\n"
    },
    {
      "commit": "a387a6cc1e97f26eb6847ed5cf3d2a6b4cf25cb0",
      "tree": "a2c6037d1b5fbdb925afa114d8dcd1f1b4d21aab",
      "parents": [
        "77994d70fe8d4805126361bbd0afbcac1cd1d2f0",
        "e5b9b6924007d6658bb1c24e958d16ec82e2a9c3"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu May 11 20:54:17 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu May 11 20:54:17 2017 +0000"
      },
      "message": "Merge \"stagefright: put battery update under a separate lock\" into oc-dev"
    },
    {
      "commit": "e5b9b6924007d6658bb1c24e958d16ec82e2a9c3",
      "tree": "ad2ef695292ac0178821f89926fbc347f5be056c",
      "parents": [
        "bbdae2f58c3bd18d72be876c023b4bfb00e2f920"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Thu May 11 11:44:56 2017 -0700"
      },
      "committer": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Thu May 11 11:49:22 2017 -0700"
      },
      "message": "stagefright: put battery update under a separate lock\n\nBattery update doesn\u0027t need to lock the main lock for\nmediaplayerservice. Battery update sometimes is called\nfrom lower level componenet (eg. StagefrightRecorder),\nlocking the main lock here has potential to deadlock.\n\nPuting the battery update in a separate class so that\nit\u0027s clear this is not to be mixed with the rest of\nthe mediaplayerservice states.\n\nbug: 38230347\nChange-Id: Idf5f26f2b07ad6303775763ce283dad0679843d5\n"
    },
    {
      "commit": "2f35206b77dd7d8a8c761e0a81ea327c10787036",
      "tree": "314fad5639b5c762be3ec16f1b685056678edf44",
      "parents": [
        "dc4272365d1c875471097db907f659731c36b53c",
        "d906ad023d3608925c4afda5c3b70a24667db758"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Thu May 11 05:54:44 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu May 11 05:54:44 2017 +0000"
      },
      "message": "Merge \"VolumeShaper: Fixes for updated Cts test\" into oc-dev am: 2d12b8e367\nam: d906ad023d\n\nChange-Id: I27856718a4914e396a7c387da7b4f4e4b7c245e6\n"
    },
    {
      "commit": "d906ad023d3608925c4afda5c3b70a24667db758",
      "tree": "4fceb037dc74eb16098d5229944ed941253a0fa1",
      "parents": [
        "03e1f70c17238799081a9021589adf57c0f04713",
        "2d12b8e3677c2c6b620358fa7e4699dda8c0f0bc"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Thu May 11 05:33:51 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu May 11 05:33:51 2017 +0000"
      },
      "message": "Merge \"VolumeShaper: Fixes for updated Cts test\" into oc-dev\nam: 2d12b8e367\n\nChange-Id: Ic4e567226fa649c425199e9068a3dac29809c980\n"
    },
    {
      "commit": "2d12b8e3677c2c6b620358fa7e4699dda8c0f0bc",
      "tree": "bde5a42aaca3e488c429bf26595f7a67a8ff97b2",
      "parents": [
        "ae1c19fc33d24274ca665408f19c347c8b928c56",
        "f370264dfa5237524a3535f5242a0c68cbbb13eb"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Thu May 11 04:24:04 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu May 11 04:24:05 2017 +0000"
      },
      "message": "Merge \"VolumeShaper: Fixes for updated Cts test\" into oc-dev"
    },
    {
      "commit": "f370264dfa5237524a3535f5242a0c68cbbb13eb",
      "tree": "b0cab4fa2ae4243ce2a870c3d91e8124dc2d3510",
      "parents": [
        "549bd02a8421b0b53a1b5e8961a41cf551fce72d"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Fri May 05 17:33:32 2017 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed May 10 14:17:40 2017 -0700"
      },
      "message": "VolumeShaper: Fixes for updated Cts test\n\n1) Limit number of VolumeShapers that can be created.\n   a) 16 system VolumeShapers\n   b) 16 application/client VolumeShapers\n2) Return proper volume before VolumeShaper is started.\n3) Consistent xOffset definition used internally:\n   a) this is now always the position on the volumeshaper curve\n      which can go backwards if in REVERSE.\n   b) normalized time is always forward going and is scaled\n      to 0.f and 1.f depending on progress relative to\n      the curve\u0027s duration.\n4) Fix replace method.\n5) Add comments.\n\nTest: Use updated CTS VolumeShaperTest\nBug: 37536598\nChange-Id: I837ab2a481adc0abbd3f1338bfe2cb79831b11fa\n"
    },
    {
      "commit": "4a40215090c1cea929942d7dc9a27c19074d1485",
      "tree": "cdd4c100b3cd0de5b2f30937791d30966dc2c3f4",
      "parents": [
        "8db9fee7e1648d9c496ee35e60dcfc08676225aa",
        "5a7ae5ecbadc465588f495cf35f1cf4c3b2b1b9d"
      ],
      "author": {
        "name": "Haynes Mathew George",
        "email": "hgeorge@codeaurora.org",
        "time": "Wed May 10 02:21:09 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 10 02:21:09 2017 +0000"
      },
      "message": "Merge \"nuplayer: Do not notify EOS when paused\" into oc-dev am: b81da0bd69\nam: 5a7ae5ecba\n\nChange-Id: I24c5dc5ed1fe2565386cf6a8e65d297bda7b3f17\n"
    },
    {
      "commit": "5a7ae5ecbadc465588f495cf35f1cf4c3b2b1b9d",
      "tree": "e922775b11357a97570857555c6cd10643d5241b",
      "parents": [
        "746e4da9fef85b962d945cb353e7c8ba888c64ed",
        "b81da0bd69fb703585f5601b9e712068fff6b4e9"
      ],
      "author": {
        "name": "Haynes Mathew George",
        "email": "hgeorge@codeaurora.org",
        "time": "Wed May 10 02:15:47 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 10 02:15:47 2017 +0000"
      },
      "message": "Merge \"nuplayer: Do not notify EOS when paused\" into oc-dev\nam: b81da0bd69\n\nChange-Id: I6ca6e018d63cd171e38ef34a49da1f217f54fded\n"
    },
    {
      "commit": "b81da0bd69fb703585f5601b9e712068fff6b4e9",
      "tree": "e119cad1ba260969fa06dcb6e24588b0cb7b466b",
      "parents": [
        "b622f93984da567396b79af08bde231b61dd3169",
        "62d4e07eb5f99bd469f92897e47f5598abef99d3"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed May 10 01:57:14 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 10 01:57:14 2017 +0000"
      },
      "message": "Merge \"nuplayer: Do not notify EOS when paused\" into oc-dev"
    },
    {
      "commit": "62d4e07eb5f99bd469f92897e47f5598abef99d3",
      "tree": "5e1162ee3e1122881f41d59e1e32351bd4702ef5",
      "parents": [
        "02cccfd9e790ba8758aba2b4f2a600a7d8fd1566"
      ],
      "author": {
        "name": "Haynes Mathew George",
        "email": "hgeorge@codeaurora.org",
        "time": "Mon Jun 13 11:23:22 2016 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue May 09 22:25:32 2017 +0000"
      },
      "message": "nuplayer: Do not notify EOS when paused\n\nPlayback switches to next clip if a paused clip is seeked to EOS.\nThis happens as onDrainAudioQueue is allowed to fill buffer\nwhen paused. During drain, EOS is notified even during paused state\nand playback switches to next clip.\n\nAvoid notifying EOS when paused.\n\nauthored-by: Chaithanya Krishna Bacharaju \u003cchaithan@codeaurora.org\u003e\nTest: run mediaplayer\nBug: 38022556\nChange-Id: I8261219615f4ce726e03d02b0cb3e71889a711d0\n(cherry picked from commit b99e3649f468015f5156e71d02b11c2e2c236c58)\n"
    },
    {
      "commit": "c8df2c1881daaf3743abf3b3dfc7299c4918de63",
      "tree": "083f8119140714395b100c8dcc24f6d73f9ffd82",
      "parents": [
        "ca51723dce743d357cb2866d903d4162fb521a5d"
      ],
      "author": {
        "name": "Steven Moreland",
        "email": "smoreland@google.com",
        "time": "Tue May 02 17:06:16 2017 -0700"
      },
      "committer": {
        "name": "Steven Moreland",
        "email": "smoreland@google.com",
        "time": "Wed May 03 03:04:22 2017 +0000"
      },
      "message": "Remove redundant dependencies\n\nandroid.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.\n\nTest: links\nBug: 33276472\nChange-Id: I6ffb95645e767ab2575623333b12ba720f64d58b\n(cherry picked from commit 5e732cdddf1efd2f78f24b16463c17235103226e)\n"
    },
    {
      "commit": "5e732cdddf1efd2f78f24b16463c17235103226e",
      "tree": "8e664d46fa710517fd3b06641b8437670ea8e1f2",
      "parents": [
        "2dde082e9f58b6aa7fab29f929dc11101db02846"
      ],
      "author": {
        "name": "Steven Moreland",
        "email": "smoreland@google.com",
        "time": "Tue May 02 17:06:16 2017 -0700"
      },
      "committer": {
        "name": "Steven Moreland",
        "email": "smoreland@google.com",
        "time": "Tue May 02 17:06:16 2017 -0700"
      },
      "message": "Remove redundant dependencies\n\nandroid.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.\n\nTest: links\nBug: 33276472\nChange-Id: I6ffb95645e767ab2575623333b12ba720f64d58b\n"
    },
    {
      "commit": "0bdcf66bf30dfe60b44ea2d69bc846cca33fc3f3",
      "tree": "b2cf28124cfdb348875ce7e0b173f71595d8ea85",
      "parents": [
        "f6014a1ceee2e2c71f6603048eebc346a261e87a"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Thu Apr 27 16:15:51 2017 -0700"
      },
      "committer": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Tue May 02 15:08:48 2017 -0700"
      },
      "message": "Fix trivial warnings hidden by -isystem\n\nFix the trivial warnings that are hidden by the use of -isystem to\ninclude frameworks/av and caught by -Werror.\n\nTest: m -j checkbuild\nBug: 31751828\nChange-Id: I155f9f772ce0a84b364313814cb7cf528b9de4eb\nMerged-In: I155f9f772ce0a84b364313814cb7cf528b9de4eb\n(cherry picked from commit b8c35f94470d1518e2def0582aaec4e038c92af0)\n"
    },
    {
      "commit": "4e399991097e4d7180ab1e276e15f546705aa6f3",
      "tree": "a0adfa530b793dce1d8f80f154f2243c7c4caac1",
      "parents": [
        "1759bb5511fe1b6648e3da1b1e7ee98ca7aa2b1b"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Thu Apr 27 16:15:51 2017 -0700"
      },
      "committer": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Tue May 02 14:51:13 2017 -0700"
      },
      "message": "Fix trivial warnings hidden by -isystem\n\nFix the trivial warnings that are hidden by the use of -isystem to\ninclude frameworks/av and caught by -Werror.\n\nTest: m -j checkbuild\nBug: 31751828\nChange-Id: I155f9f772ce0a84b364313814cb7cf528b9de4eb\nMerged-In: I155f9f772ce0a84b364313814cb7cf528b9de4eb\n(cherry picked from commit b8c35f94470d1518e2def0582aaec4e038c92af0)\n"
    },
    {
      "commit": "471f8f0354264fbf02d60c8d7a2956d3e377ae10",
      "tree": "466901e4135e0a6e19d33f165f5ecf5dabf10fd3",
      "parents": [
        "725cb1e504b39ace9961a5097429af2eafbb71ba",
        "e941bda6971fa8a5dbfafc0a80ed528ac70e763f"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Mon May 01 20:39:15 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon May 01 20:39:15 2017 +0000"
      },
      "message": "Merge \"GenericSource: close unused file descriptor\" into oc-dev am: 76e360332d\nam: e941bda697\n\nChange-Id: I793c711309c7c6648f7083db4ce67e5b79696ee5\n"
    },
    {
      "commit": "e941bda6971fa8a5dbfafc0a80ed528ac70e763f",
      "tree": "562b988a6860879c62cb9f3e62f66ac3365fb15c",
      "parents": [
        "af68d9aa9ae3e0c6c5df490ae63a5655dd1e2974",
        "76e360332d7e0e4c0c132bf712c14f5a8ee2a217"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Mon May 01 20:36:43 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon May 01 20:36:43 2017 +0000"
      },
      "message": "Merge \"GenericSource: close unused file descriptor\" into oc-dev\nam: 76e360332d\n\nChange-Id: Iee6c29c26709b8dee43551e553cddd3d9ee225b8\n"
    },
    {
      "commit": "76e360332d7e0e4c0c132bf712c14f5a8ee2a217",
      "tree": "9eddbd0c3c34595aa2dc83cf2d217fc11ff6daa8",
      "parents": [
        "0e69c9e25152b08a188ef254065e044594eba896",
        "116687f5c0bd31d8c890d3456213e0391b8cbf87"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Mon May 01 20:30:25 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon May 01 20:30:26 2017 +0000"
      },
      "message": "Merge \"GenericSource: close unused file descriptor\" into oc-dev"
    },
    {
      "commit": "116687f5c0bd31d8c890d3456213e0391b8cbf87",
      "tree": "5d5deeab6610b3d76b20bbe0da6007d6981666bd",
      "parents": [
        "abbb67724e5600c17450ed148fb2c214c5aac9ee"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Mon May 01 09:51:40 2017 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Mon May 01 11:26:00 2017 -0700"
      },
      "message": "GenericSource: close unused file descriptor\n\nTest: dumpsys media.player with photos, ringtone\nBug: 37792834\nChange-Id: I04e0f05ea642e3bfe5e6af12bfabea69838716b4\n"
    },
    {
      "commit": "16e6a903e4360e541c21f4391b1d3ab19d687feb",
      "tree": "71f67c8eb588acb8c13ca401cb4c447ebde34cc1",
      "parents": [
        "da8a81dc076ac4a4cddc6f3356b7f6ffbc760e7a",
        "b8c35f94470d1518e2def0582aaec4e038c92af0"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Sat Apr 29 20:17:40 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Sat Apr 29 20:17:42 2017 +0000"
      },
      "message": "Merge changes I155f9f77,Ibb1aa07a\n\n* changes:\n  Fix trivial warnings hidden by -isystem\n  Fix non-trivial warnings hidden by -isystem\n"
    },
    {
      "commit": "5e5a21903e4a5d0413fd7582fbada973323c61b6",
      "tree": "496d86ab66863e1b89328f6484621c0a0cfdd382",
      "parents": [
        "f3ae1a8772ee92a3beefa28b1c1f8ea31b944a24",
        "7e83db7830f34f9aa55d46a2d8dc2a8ee7e2dc2e"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Sat Apr 29 00:52:22 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sat Apr 29 00:52:22 2017 +0000"
      },
      "message": "Merge \"Reporting the player\u0027s data source type in media analytics\" into oc-dev am: 64f9ce291f\nam: 7e83db7830\n\nChange-Id: Ic1efb941d1ace0a07ef8f5c783cb0e3dfea54ac7\n"
    },
    {
      "commit": "7e83db7830f34f9aa55d46a2d8dc2a8ee7e2dc2e",
      "tree": "eec71ccdd111e64218862d067cdef4e1c8b0b445",
      "parents": [
        "a9a09d6e34fe61c467863a2f5b9c21381f7e081f",
        "64f9ce291f2a8e8b89ba1682660299312148c1de"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Sat Apr 29 00:50:21 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sat Apr 29 00:50:21 2017 +0000"
      },
      "message": "Merge \"Reporting the player\u0027s data source type in media analytics\" into oc-dev\nam: 64f9ce291f\n\nChange-Id: I9d31c3005249461f63bddc88597cce939d6739d6\n"
    },
    {
      "commit": "64f9ce291f2a8e8b89ba1682660299312148c1de",
      "tree": "19aae08c806f3d0417724257c5b8501914f1d98d",
      "parents": [
        "a01a7ff652eb163984f1ba9aacba5b8e9e0e44a9",
        "ff63de757653579d751665bc3611571fbcacf53d"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Sat Apr 29 00:45:46 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Sat Apr 29 00:45:48 2017 +0000"
      },
      "message": "Merge \"Reporting the player\u0027s data source type in media analytics\" into oc-dev"
    },
    {
      "commit": "b8c35f94470d1518e2def0582aaec4e038c92af0",
      "tree": "0ef68bf31016198ef4a9f26d33025fa332c2abd4",
      "parents": [
        "6f51c153ea5e4187a313e47ac8bad9a1a999d4e1"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Thu Apr 27 16:15:51 2017 -0700"
      },
      "committer": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Fri Apr 28 16:41:36 2017 -0700"
      },
      "message": "Fix trivial warnings hidden by -isystem\n\nFix the trivial warnings that are hidden by the use of -isystem to\ninclude frameworks/av and caught by -Werror.\n\nTest: m -j checkbuild\nBug: 31751828\nChange-Id: I155f9f772ce0a84b364313814cb7cf528b9de4eb\n"
    },
    {
      "commit": "8dbc1205446e09f43a00b2d88c15d2cd93a0b998",
      "tree": "c29cf31d4b09f5b8c1ceef87ac0410e0eb87b337",
      "parents": [
        "75d76012b684eaa56e90280f69b23fc2d8294636"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Thu Apr 27 12:33:20 2017 -0700"
      },
      "committer": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Fri Apr 28 22:06:51 2017 +0000"
      },
      "message": "LOCAL_CLANG :\u003d true is now the default\n\nTest: verify that build has no failures\nChange-Id: Ib249b276c6295e55eb54fa37b6d15486415dfbed\nMerged-In: Ib249b276c6295e55eb54fa37b6d15486415dfbed\n(cherry picked from commit 5f5ee1110dd85001b43db7637a97474acfe8d681)\n"
    },
    {
      "commit": "ff63de757653579d751665bc3611571fbcacf53d",
      "tree": "a7abce0f9f1994088f057fcff666fb97282d6272",
      "parents": [
        "89b67d60548f8989412aa9cb6ad8a5f287ce303b"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Wed Apr 26 15:10:42 2017 -0700"
      },
      "committer": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Fri Apr 28 11:15:27 2017 -0700"
      },
      "message": "Reporting the player\u0027s data source type in media analytics\n\nBug:  37720861\nTest: metrics dumpsys\nChange-Id: I44eb7049f10aa4f89c9e7b0de6b47d169129d15d\n"
    },
    {
      "commit": "88858c73749a6582bd9a1cda4fc0ca57ee7da34c",
      "tree": "ac4c9da44ce6e6392afbd0cd8ae7b8a30f88a97c",
      "parents": [
        "fa382b7165edc0eba84975a0abaf159a70ea9d86",
        "3a5d1e8f18f1ec62962fb0e35eab473a6176d004"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu Apr 27 22:15:31 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Apr 27 22:15:32 2017 +0000"
      },
      "message": "Merge \"media: Further reduce the recording start time offset.\""
    },
    {
      "commit": "3a5d1e8f18f1ec62962fb0e35eab473a6176d004",
      "tree": "4de1b04b49fc3defea4ea268009ef424777e813e",
      "parents": [
        "b5ef3889aedd585281738440a70d41ef97a364cd"
      ],
      "author": {
        "name": "Hangyu Kuang",
        "email": "hkuang@google.com",
        "time": "Thu Apr 27 13:02:49 2017 -0700"
      },
      "committer": {
        "name": "Hangyu Kuang",
        "email": "hkuang@google.com",
        "time": "Thu Apr 27 13:02:49 2017 -0700"
      },
      "message": "media: Further reduce the recording start time offset.\n\nBug:36902471\nTest: Camera recording with start and immediately stop.\nChange-Id: Iba470a4f36f81d81086998d2472e713226c25d69\n"
    }
  ],
  "next": "01e0ee177ff9f9e66b606c440fffeeb1509634d9"
}
