)]}'
{
  "log": [
    {
      "commit": "d241b656d565bfbb37c2cbb84730b2bf3b25b158",
      "tree": "70007d12fb1e3575187fdfa3c9b47b386a6aa5e8",
      "parents": [
        "77bfcd38b78efd919e898a1165f1b99e34b6d7d7",
        "a28ec4a3f8357224b59fc44b6c91751fc1d8451c"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Thu Apr 27 13:48:58 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Apr 27 13:48:58 2017 +0000"
      },
      "message": "Merge \"Modular DRM for MediaPlayer/Removing mimes report\" into oc-dev\nam: a28ec4a3f8\n\nChange-Id: I711f66f381452b18149276b9c798eb6ad9e35916\n"
    },
    {
      "commit": "a28ec4a3f8357224b59fc44b6c91751fc1d8451c",
      "tree": "84d60767098680a458f1f20c585e5f6a5c6f46fc",
      "parents": [
        "4271c82efd7c59f6e75e09fa748769bad4cfeee2",
        "dd4ce1877814d6fb005e89021272feb3ccfb81d0"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Thu Apr 27 13:42:17 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Apr 27 13:42:18 2017 +0000"
      },
      "message": "Merge \"Modular DRM for MediaPlayer/Removing mimes report\" into oc-dev"
    },
    {
      "commit": "77bfcd38b78efd919e898a1165f1b99e34b6d7d7",
      "tree": "6b0d4c774c11b1af55ca97a4820c4da29c99f907",
      "parents": [
        "3854e6efb9b8f5e883bcf3ae56ab4837607fd191",
        "4271c82efd7c59f6e75e09fa748769bad4cfeee2"
      ],
      "author": {
        "name": "Pawin Vongmasa",
        "email": "pawin@google.com",
        "time": "Thu Apr 27 06:39:21 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Apr 27 06:39:21 2017 +0000"
      },
      "message": "Make IOmx registration independent of IOmxStore\nam: 4271c82efd\n\nChange-Id: I3278a860b0dcd39a4107b082dfc03d72fe8375dc\n"
    },
    {
      "commit": "4271c82efd7c59f6e75e09fa748769bad4cfeee2",
      "tree": "c7a3d4450357fd0b8a0af26e3996c2b51fcf3f80",
      "parents": [
        "1c57d1e42aef042f85e8a8eaf754618a44922e39"
      ],
      "author": {
        "name": "Pawin Vongmasa",
        "email": "pawin@google.com",
        "time": "Wed Apr 26 21:24:30 2017 -0700"
      },
      "committer": {
        "name": "Pawin Vongmasa",
        "email": "pawin@google.com",
        "time": "Wed Apr 26 21:27:45 2017 -0700"
      },
      "message": "Make IOmx registration independent of IOmxStore\n\nThis CL allows IOmx to attempt registration even when IOmxStore fails to\nregister.\n\nTest: Manual use of Camera\n\nBug: 37657124\nBug: 37726880\nChange-Id: I108c507326ee55c17acc524233e70afa5cb5a4f0\n"
    },
    {
      "commit": "3854e6efb9b8f5e883bcf3ae56ab4837607fd191",
      "tree": "bcbe34fc02f9d3edd29323bd7ebaaa25a4a52586",
      "parents": [
        "c5f13dccb07448986f20e0c11dab643d0c5c685c",
        "1c57d1e42aef042f85e8a8eaf754618a44922e39"
      ],
      "author": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Thu Apr 27 00:37:08 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Apr 27 00:37:08 2017 +0000"
      },
      "message": "Merge \"stagefright: prevent component to be stuck on error\" into oc-dev\nam: 1c57d1e42a\n\nChange-Id: Ifd679c79aebe6997af9d5adaf550e0f1804a6693\n"
    },
    {
      "commit": "1c57d1e42aef042f85e8a8eaf754618a44922e39",
      "tree": "8db760c4ca251399eb7c352bec2ecadfef13567a",
      "parents": [
        "a62c3c31e61086c4a15acb27297c7d17a6b3b1ef",
        "4ec8d83215d61ce8dfad15f5c42e7a190d924bf6"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu Apr 27 00:31:02 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Apr 27 00:31:03 2017 +0000"
      },
      "message": "Merge \"stagefright: prevent component to be stuck on error\" into oc-dev"
    },
    {
      "commit": "c5f13dccb07448986f20e0c11dab643d0c5c685c",
      "tree": "069fabd913ee7885142e2b89730d43e9892f1510",
      "parents": [
        "23b206dbf8828c7ddddfb7f3029995e63a50cc7e",
        "a62c3c31e61086c4a15acb27297c7d17a6b3b1ef"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Apr 27 00:23:06 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Apr 27 00:23:06 2017 +0000"
      },
      "message": "Merge \"GraphicBufferSource: remove free codec buffers only when submitted to codec\" into oc-dev\nam: a62c3c31e6\n\nChange-Id: Ic545e09b0ed3aeae2975ceb4718dcb26523359a6\n"
    },
    {
      "commit": "a62c3c31e61086c4a15acb27297c7d17a6b3b1ef",
      "tree": "7ffc4d4b56fff390ee3746603ef90c48297839a6",
      "parents": [
        "b0cc0bc266cd18f39e86eb10048f84e7b8517c7d",
        "195f1ed9563ea2264dbca8c783695d9741dab3d8"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu Apr 27 00:17:06 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Apr 27 00:17:07 2017 +0000"
      },
      "message": "Merge \"GraphicBufferSource: remove free codec buffers only when submitted to codec\" into oc-dev"
    },
    {
      "commit": "23b206dbf8828c7ddddfb7f3029995e63a50cc7e",
      "tree": "c7c8529dd7df06b18be1a9d4a483242a186f47cf",
      "parents": [
        "14b7161b487d2bb8577cd31dc0c2694c4e04e17a",
        "b0cc0bc266cd18f39e86eb10048f84e7b8517c7d"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed Apr 26 23:40:33 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Apr 26 23:40:33 2017 +0000"
      },
      "message": "Merge \"AudioMixer: fix assertion for multichannel playback\" into oc-dev\nam: b0cc0bc266\n\nChange-Id: I9a79249920720d0979ee514645ae83ffe554ba8d\n"
    },
    {
      "commit": "b0cc0bc266cd18f39e86eb10048f84e7b8517c7d",
      "tree": "18d0dc5087800203dd4f06e40fc50d4035f2aa29",
      "parents": [
        "12b97c8d659c48923e42ce4abd2b22b3b7a9909a",
        "85395896e72f8fc943c79c134e79b3ad9c783363"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed Apr 26 23:29:15 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Apr 26 23:29:16 2017 +0000"
      },
      "message": "Merge \"AudioMixer: fix assertion for multichannel playback\" into oc-dev"
    },
    {
      "commit": "4ec8d83215d61ce8dfad15f5c42e7a190d924bf6",
      "tree": "4d3761ef2e02a71ea1bcc8b37d56e5f20e1c1af5",
      "parents": [
        "7d25f0f525ffa97687dde3636a354694d59cbf37"
      ],
      "author": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Tue Apr 18 11:56:31 2017 -0700"
      },
      "committer": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Wed Apr 26 23:14:24 2017 +0000"
      },
      "message": "stagefright: prevent component to be stuck on error\n\nBug: 36818684\nBug: 34983882\nTest: Run the command below on Nexus Player overnight:\nwhile true ; do adb shell am instrument -e class \u0027android.platform.tv.tests.aupt.YouTubeTests\u0027  -w \u0027android.platform.tv.tests.aupt/android.support.test.aupt.AuptTestRunner\u0027 ; done\nTest: adb shell am instrument -e size small -w \u0027android.media.cts/android.support.test.runner.AndroidJUnitRunner\u0027\nChange-Id: I9663c3d62d97c3f5db0af6c30f39bb59cbc7e3e7\n"
    },
    {
      "commit": "14b7161b487d2bb8577cd31dc0c2694c4e04e17a",
      "tree": "86594101a12461f0057be3c7818fb0caf31fb78d",
      "parents": [
        "99eb0f8d7d8de94f94c251b55b6c76d1adf63924",
        "12b97c8d659c48923e42ce4abd2b22b3b7a9909a"
      ],
      "author": {
        "name": "Pawin Vongmasa",
        "email": "pawin@google.com",
        "time": "Wed Apr 26 23:10:32 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Apr 26 23:10:32 2017 +0000"
      },
      "message": "Merge \"Stub implementation for IOmxStore.\" into oc-dev\nam: 12b97c8d65\n\nChange-Id: I41c7e6a2d765f4adfe3c2315af2af2dbe365e2fe\n"
    },
    {
      "commit": "12b97c8d659c48923e42ce4abd2b22b3b7a9909a",
      "tree": "a2ca295abbb5f291a7f73d5a1a1630b180c066dd",
      "parents": [
        "02cccfd9e790ba8758aba2b4f2a600a7d8fd1566",
        "52257b75115135821bba562ac35c0c6325a1e100"
      ],
      "author": {
        "name": "Pawin Vongmasa",
        "email": "pawin@google.com",
        "time": "Wed Apr 26 22:58:29 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Apr 26 22:58:30 2017 +0000"
      },
      "message": "Merge \"Stub implementation for IOmxStore.\" into oc-dev"
    },
    {
      "commit": "195f1ed9563ea2264dbca8c783695d9741dab3d8",
      "tree": "9375fdea39e28593af0cb5088bc13e8ebb5c09e1",
      "parents": [
        "02cccfd9e790ba8758aba2b4f2a600a7d8fd1566"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Apr 26 15:19:47 2017 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Apr 26 15:21:13 2017 -0700"
      },
      "message": "GraphicBufferSource: remove free codec buffers only when submitted to codec\n\nBug: 37556535\nChange-Id: I516c0a2fc6c78e937360a2a5c2a3dcdea1d07370\n"
    },
    {
      "commit": "dd4ce1877814d6fb005e89021272feb3ccfb81d0",
      "tree": "c881295cd82baf8c3d1f2d7045f833c8ab3cb1ae",
      "parents": [
        "5551797eb2d813ef01e23eb93fd680bc1e0dd886"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Thu Apr 20 15:25:39 2017 -0700"
      },
      "committer": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Wed Apr 26 21:58:23 2017 +0000"
      },
      "message": "Modular DRM for MediaPlayer/Removing mimes report\n\nBug: 34559906\nTest: GTS Tests\nChange-Id: I6877b9ac4ffd36f0ed476c3b4bbb0770da5abaf6\n"
    },
    {
      "commit": "99eb0f8d7d8de94f94c251b55b6c76d1adf63924",
      "tree": "e1161199751f7c25472f5fa36487a8e44acd0072",
      "parents": [
        "9fa635151e26c9b0bd9cd1091e4286d63c19fd49",
        "02cccfd9e790ba8758aba2b4f2a600a7d8fd1566"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Apr 26 19:42:14 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Apr 26 19:42:14 2017 +0000"
      },
      "message": "stagefright: don\u0027t actually acquire graphic buffer when we don\u0027t want to\nam: 02cccfd9e7\n\nChange-Id: I8eb1bfd6e18545ae148701114492e6a66f42effb\n"
    },
    {
      "commit": "9fa635151e26c9b0bd9cd1091e4286d63c19fd49",
      "tree": "9561f17376fe1f78cc38f540dd355584669762ca",
      "parents": [
        "93368f9602fa72be364f5286b4148b0bd8b964e5",
        "8ef0d15f29b8dd3ff86a4343b5f7d7a947637404"
      ],
      "author": {
        "name": "Dimitry Ivanov",
        "email": "dimitry@google.com",
        "time": "Wed Apr 26 03:06:42 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Apr 26 03:06:42 2017 +0000"
      },
      "message": "Merge \"Allow fstatfs64 syscall for mediacodec/extractor\" am: 94d15f9c0c am: 554327502a\nam: 8ef0d15f29  -s ours\n\nChange-Id: Ibb37ad408e1e97c56b01f9821ff1cf1d34900589\n"
    },
    {
      "commit": "8ef0d15f29b8dd3ff86a4343b5f7d7a947637404",
      "tree": "50d3b1325e776e5534d17a6ffb025d37097e4a68",
      "parents": [
        "12213cecce3e15c3fc5fdd640ba1704403753eb8",
        "554327502ae59cb05627468851477c9964aeb039"
      ],
      "author": {
        "name": "Dimitry Ivanov",
        "email": "dimitry@google.com",
        "time": "Wed Apr 26 02:19:08 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Apr 26 02:19:08 2017 +0000"
      },
      "message": "Merge \"Allow fstatfs64 syscall for mediacodec/extractor\" am: 94d15f9c0c\nam: 554327502a\n\nChange-Id: Iafc67d6e892cc0d1f3202b13f99bdac0ce8102c1\n"
    },
    {
      "commit": "554327502ae59cb05627468851477c9964aeb039",
      "tree": "19ebe465cde767b1b588dbf66f10e917f380683c",
      "parents": [
        "d91dd4f04638e9919254d45f8bbf290c6357e822",
        "94d15f9c0c7dc8a916ebfcf0f208adcc427df7f6"
      ],
      "author": {
        "name": "Dimitry Ivanov",
        "email": "dimitry@google.com",
        "time": "Wed Apr 26 02:16:08 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Apr 26 02:16:08 2017 +0000"
      },
      "message": "Merge \"Allow fstatfs64 syscall for mediacodec/extractor\"\nam: 94d15f9c0c\n\nChange-Id: I4cf3b87ad61397509b08ee7def6022cdec05264d\n"
    },
    {
      "commit": "94d15f9c0c7dc8a916ebfcf0f208adcc427df7f6",
      "tree": "19ebe465cde767b1b588dbf66f10e917f380683c",
      "parents": [
        "6fb63cbac709e7b5f99f4bf4822c0eeac78236a9",
        "e7566e73f84dde30c90c9776defb3df3d3d5b916"
      ],
      "author": {
        "name": "Dimitry Ivanov",
        "email": "dimitry@google.com",
        "time": "Wed Apr 26 02:09:04 2017 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Apr 26 02:09:06 2017 +0000"
      },
      "message": "Merge \"Allow fstatfs64 syscall for mediacodec/extractor\""
    },
    {
      "commit": "02cccfd9e790ba8758aba2b4f2a600a7d8fd1566",
      "tree": "80c9b362a4db3acfa49fb41ecd248ba50f54be8b",
      "parents": [
        "89b67d60548f8989412aa9cb6ad8a5f287ce303b"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Tue Apr 25 18:08:42 2017 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Tue Apr 25 18:17:06 2017 -0700"
      },
      "message": "stagefright: don\u0027t actually acquire graphic buffer when we don\u0027t want to\n\nBug: 37556535\nChange-Id: Ic9d2bddd12c8a750c4d285a1915ac3f4455aceae\n"
    },
    {
      "commit": "e7566e73f84dde30c90c9776defb3df3d3d5b916",
      "tree": "165e936cd627bb58f19441e59bfe3aead12be3c7",
      "parents": [
        "f99ffd986c98b9e888678f63202788c59a9867e8"
      ],
      "author": {
        "name": "Dimitry Ivanov",
        "email": "dimitry@google.com",
        "time": "Tue Apr 25 16:55:03 2017 -0700"
      },
      "committer": {
        "name": "Dimitry Ivanov",
        "email": "dimitry@google.com",
        "time": "Tue Apr 25 16:55:03 2017 -0700"
      },
      "message": "Allow fstatfs64 syscall for mediacodec/extractor\n\nThis syscall is used by the linker to detect files located on tmpfs\n\nBug: http://b/37245203\nBug: http://b/37590327\nTest: boot an angler and check that mediacodec does not crash\nChange-Id: I7147063db7d6b8ec39a25d39b60e8e6882addf6e\n(cherry picked from commit 1516b02c1a4ab5739bffea9d75ad9b52fc1d5b91)\n"
    },
    {
      "commit": "85395896e72f8fc943c79c134e79b3ad9c783363",
      "tree": "ac326dd9dc56b5ad6587b1a81a3ed6c18953f967",
      "parents": [
        "94cfe137a105ec7db047e963e18483425e0d2272"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Apr 25 16:47:52 2017 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Apr 25 16:47:52 2017 -0700"
      },
      "message": "AudioMixer: fix assertion for multichannel playback\n\nReset mPostDownmixReformatBufferProvider before changing\ndownmixerBufferProvider.\n\nTest: Play Music with multichannel files\nBug: 27526910\nChange-Id: I5803e169cb9da4e7681bc8caf1452e79e5a4d1d5\n"
    },
    {
      "commit": "93368f9602fa72be364f5286b4148b0bd8b964e5",
      "tree": "9561f17376fe1f78cc38f540dd355584669762ca",
      "parents": [
        "cc37107c575f86d8f03f4bac9115ea6b0b6ff80b",
        "89b67d60548f8989412aa9cb6ad8a5f287ce303b"
      ],
      "author": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Tue Apr 25 19:56:46 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Apr 25 19:56:46 2017 +0000"
      },
      "message": "Merge \"aaudio: change samplesPerFrame() to channelCount()\" into oc-dev\nam: 89b67d6054\n\nChange-Id: Ifdb4d48ae3b432eae992000ede3fe889266e3ad8\n"
    },
    {
      "commit": "89b67d60548f8989412aa9cb6ad8a5f287ce303b",
      "tree": "f0ab38dc6ad05f1d3628af300d9281707500c75e",
      "parents": [
        "94cfe137a105ec7db047e963e18483425e0d2272",
        "20523edbf2f597c53b90e76694331c807e559515"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Tue Apr 25 19:42:26 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Apr 25 19:42:28 2017 +0000"
      },
      "message": "Merge \"aaudio: change samplesPerFrame() to channelCount()\" into oc-dev"
    },
    {
      "commit": "20523edbf2f597c53b90e76694331c807e559515",
      "tree": "545c9381d3734e389bf16cd210341411eb08b55a",
      "parents": [
        "79a89ef4eb06a2d29fc3d083112de398111a9ddb"
      ],
      "author": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Mon Apr 24 17:04:01 2017 -0700"
      },
      "committer": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Tue Apr 25 10:45:43 2017 -0700"
      },
      "message": "aaudio: change samplesPerFrame() to channelCount()\n\nBoth functions provided for now.\nWill remove deprecated function in later CL.\n\nBug: 37646784\nTest: write_sine.cpp and write_sine_callback.cpp\nChange-Id: I1241aafa206112c526d6ca250ba5209489e1a46e\nSigned-off-by: Phil Burk \u003cphilburk@google.com\u003e\n"
    },
    {
      "commit": "cc37107c575f86d8f03f4bac9115ea6b0b6ff80b",
      "tree": "ccd699524f17d8f206e742d9d1873bbee653de70",
      "parents": [
        "db59802a59365408b19d95375b8b39fd0a05e002",
        "94cfe137a105ec7db047e963e18483425e0d2272"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Apr 25 17:08:54 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Apr 25 17:08:54 2017 +0000"
      },
      "message": "Merge \"VolumeShaper: Clean up constructors\" into oc-dev\nam: 94cfe137a1\n\nChange-Id: Ia50e6feeebc4c1e8347c17d1a4144b06e9fa1b26\n"
    },
    {
      "commit": "94cfe137a105ec7db047e963e18483425e0d2272",
      "tree": "cea5d65195c3b408943149c5a593d97a691cff08",
      "parents": [
        "9706527f86fc9895ffd0bf288bab6a2b5749a822",
        "7d712bb0916182cb73f05ec9144b39314ddd5eab"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Apr 25 17:03:14 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Apr 25 17:03:15 2017 +0000"
      },
      "message": "Merge \"VolumeShaper: Clean up constructors\" into oc-dev"
    },
    {
      "commit": "db59802a59365408b19d95375b8b39fd0a05e002",
      "tree": "045032ca853c9753359cbba59c52e64d3def3544",
      "parents": [
        "fe898ee931983ab47204ee5e1c800c64ec065988",
        "9706527f86fc9895ffd0bf288bab6a2b5749a822"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Apr 25 16:28:21 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Apr 25 16:28:21 2017 +0000"
      },
      "message": "Merge \"VolumeShaper: improve logging and dumpsys\" into oc-dev\nam: 9706527f86\n\nChange-Id: If416846deaba6ce56a814271d6f0002fa36ae539\n"
    },
    {
      "commit": "9706527f86fc9895ffd0bf288bab6a2b5749a822",
      "tree": "62bb529f4105eac6055ded032b44a90f355eebb3",
      "parents": [
        "79a89ef4eb06a2d29fc3d083112de398111a9ddb",
        "da540db0fc21bc9319d9602aefe1a109d00a7e6c"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Apr 25 16:23:15 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Apr 25 16:23:16 2017 +0000"
      },
      "message": "Merge \"VolumeShaper: improve logging and dumpsys\" into oc-dev"
    },
    {
      "commit": "52257b75115135821bba562ac35c0c6325a1e100",
      "tree": "a9f4b354a9cfd8c70814d46c9b0368c07d44730a",
      "parents": [
        "087f3af6ceee8fe61a27901c7c910218664265c0"
      ],
      "author": {
        "name": "Pawin Vongmasa",
        "email": "pawin@google.com",
        "time": "Tue Apr 25 05:06:20 2017 -0700"
      },
      "committer": {
        "name": "Pawin Vongmasa",
        "email": "pawin@google.com",
        "time": "Tue Apr 25 05:15:37 2017 -0700"
      },
      "message": "Stub implementation for IOmxStore.\n\nTest: Small CtsMediaTestCases\n\nBug: 37657124\nChange-Id: I5728a12d000223231600ab3c3ab4eb044dd1847d\n"
    },
    {
      "commit": "fe898ee931983ab47204ee5e1c800c64ec065988",
      "tree": "4439a7f58625f1ad73d6c73e9a611d24007cb000",
      "parents": [
        "da9e0c9ab8df4616326b8ba56887006b419b5e97",
        "79a89ef4eb06a2d29fc3d083112de398111a9ddb"
      ],
      "author": {
        "name": "Ray Essick",
        "email": "essick@google.com",
        "time": "Tue Apr 25 07:05:45 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Apr 25 07:05:45 2017 +0000"
      },
      "message": "Suppress \u0027radio\u0027 processes to media.metrics\nam: 79a89ef4eb\n\nChange-Id: I884225339ff2c47a20ada040e0439d996fbe78d2\n"
    },
    {
      "commit": "79a89ef4eb06a2d29fc3d083112de398111a9ddb",
      "tree": "ce803c8c4c5a4507842bb2627604c47386d18192",
      "parents": [
        "087f3af6ceee8fe61a27901c7c910218664265c0"
      ],
      "author": {
        "name": "Ray Essick",
        "email": "essick@google.com",
        "time": "Mon Apr 24 15:52:54 2017 -0700"
      },
      "committer": {
        "name": "Ray Essick",
        "email": "essick@google.com",
        "time": "Tue Apr 25 05:15:48 2017 +0000"
      },
      "message": "Suppress \u0027radio\u0027 processes to media.metrics\n\nWe suppress calls from radio processes (including the basic phone\nprocess) to the media.metrics service. This had started happening\nfor a particular video telephony application that ran within phone\ninstead of as some separate app with its own user id.\n\nWe do this here to speed up when a radio process learns that it\ncan not log to media.metrics. The existing sepolicy restrictions\nremain in place as a fallback. The use case that prompted this\nwas having issues with the 5-second timeout before we learned that\nradio wasn\u0027t allowed access to the media.metrics process.\n\nBug: 37552329\nTest: observe \u0027dumpsys media.metrics\u0027 and logcat\nChange-Id: I1824aa35860bb91dd796856453c1897ec21b496c\n"
    },
    {
      "commit": "da9e0c9ab8df4616326b8ba56887006b419b5e97",
      "tree": "b986794fa5df6f9d46bfff4370ef908dc1a56caf",
      "parents": [
        "05cb9fdce7924b7a5f118f0bc724caee4280df88",
        "12213cecce3e15c3fc5fdd640ba1704403753eb8"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Tue Apr 25 01:41:59 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Apr 25 01:41:59 2017 +0000"
      },
      "message": "Merge changes I0dc38288,I48b713cd am: 6fb63cbac7 am: d91dd4f046\nam: 12213cecce  -s ours\n\nChange-Id: I53d8cea6a8a34fef45b95d55a4b9183e87f7608b\n"
    },
    {
      "commit": "12213cecce3e15c3fc5fdd640ba1704403753eb8",
      "tree": "1e86856439a25eed8d24b8a1ff800e0e8afe663c",
      "parents": [
        "0f3e20f50064bc57a88d2741e04b912a8374485b",
        "d91dd4f04638e9919254d45f8bbf290c6357e822"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Tue Apr 25 01:26:25 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Apr 25 01:26:25 2017 +0000"
      },
      "message": "Merge changes I0dc38288,I48b713cd am: 6fb63cbac7\nam: d91dd4f046\n\nChange-Id: I30bf24ba680be327928ed6e13d473fc8f1f71d3c\n"
    },
    {
      "commit": "d91dd4f04638e9919254d45f8bbf290c6357e822",
      "tree": "ea8bdaa81cc4836ef88e70f62f58bc52e3c6092c",
      "parents": [
        "101c5c2327f316c1554b29d2ddc59021c49fb77f",
        "6fb63cbac709e7b5f99f4bf4822c0eeac78236a9"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Tue Apr 25 01:24:26 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Apr 25 01:24:26 2017 +0000"
      },
      "message": "Merge changes I0dc38288,I48b713cd\nam: 6fb63cbac7\n\nChange-Id: Idd509699da1ca6c5f9c42cda4ddd5cff7de07ade\n"
    },
    {
      "commit": "6fb63cbac709e7b5f99f4bf4822c0eeac78236a9",
      "tree": "ea8bdaa81cc4836ef88e70f62f58bc52e3c6092c",
      "parents": [
        "f99ffd986c98b9e888678f63202788c59a9867e8",
        "e819f122b33336cd036aa8c0df6ba7c84a9a1e17"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Tue Apr 25 01:01:31 2017 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue Apr 25 01:01:32 2017 +0000"
      },
      "message": "Merge changes I0dc38288,I48b713cd\n\n* changes:\n  libmediautils: mk -\u003e bp\n  Clean up mediadrm dependencies\n"
    },
    {
      "commit": "05cb9fdce7924b7a5f118f0bc724caee4280df88",
      "tree": "b986794fa5df6f9d46bfff4370ef908dc1a56caf",
      "parents": [
        "e58485dc912bfea2f3084f50f53e40513eb52fbe",
        "087f3af6ceee8fe61a27901c7c910218664265c0"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Apr 25 00:28:50 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Apr 25 00:28:50 2017 +0000"
      },
      "message": "Merge \"MediaPlayer: enable more logs for extractor failure.\" into oc-dev\nam: 087f3af6ce\n\nChange-Id: I755add48326ae77a02708db2a941d3e23defeb70\n"
    },
    {
      "commit": "087f3af6ceee8fe61a27901c7c910218664265c0",
      "tree": "002b6eec341890f17136b300397be1b8147b0037",
      "parents": [
        "68d06eae7fdee42da33a0ef7bce3585f155067d6",
        "161dc698c7604cfd73310e96503179581822943b"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Tue Apr 25 00:24:00 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Apr 25 00:24:01 2017 +0000"
      },
      "message": "Merge \"MediaPlayer: enable more logs for extractor failure.\" into oc-dev"
    },
    {
      "commit": "e819f122b33336cd036aa8c0df6ba7c84a9a1e17",
      "tree": "ea8bdaa81cc4836ef88e70f62f58bc52e3c6092c",
      "parents": [
        "bd20f6bcd7fb1a906ded32eaa2989447b47fd421"
      ],
      "author": {
        "name": "Steven Moreland",
        "email": "smoreland@google.com",
        "time": "Fri Apr 07 10:44:52 2017 -0700"
      },
      "committer": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Mon Apr 24 23:40:47 2017 +0000"
      },
      "message": "libmediautils: mk -\u003e bp\n\nTest: module built and works with scheduleservice\nBug: 29251823\nChange-Id: I0dc38288b66f03919dbb9ab8abcc76dec19b0b30\n(cherry picked from commit 22ee46008d6fb8eb4cbe8aa62acf3899e5da3a92)\n"
    },
    {
      "commit": "bd20f6bcd7fb1a906ded32eaa2989447b47fd421",
      "tree": "2abac0395613aab4b27e8eb533143994827bc15e",
      "parents": [
        "f99ffd986c98b9e888678f63202788c59a9867e8"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Mon Nov 07 16:34:52 2016 -0800"
      },
      "committer": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Mon Apr 24 23:40:15 2017 +0000"
      },
      "message": "Clean up mediadrm dependencies\n\nMove various things around so mediadrmserver doesn\u0027t need\nlibstagefright and libmedia\n\nTest: build/boot\nChange-Id: I48b713cd679b992cb6ad1262c20394a9892d7027\nMerged-In: I48b713cd679b992cb6ad1262c20394a9892d7027\n(cherry picked from commit 75571e4bc76bd2defd4309c7154120840396329d)\n"
    },
    {
      "commit": "e58485dc912bfea2f3084f50f53e40513eb52fbe",
      "tree": "4c5cd18ba6d84ed12419addd86345665d2ef634d",
      "parents": [
        "c114cbd747142d37ef2e63c7c08976e80ec5a99d",
        "68d06eae7fdee42da33a0ef7bce3585f155067d6"
      ],
      "author": {
        "name": "Chien-Yu Chen",
        "email": "cychen@google.com",
        "time": "Mon Apr 24 22:40:49 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Apr 24 22:40:49 2017 +0000"
      },
      "message": "Merge \"camera: Update for enableZsl values in template\" into oc-dev\nam: 68d06eae7f\n\nChange-Id: Ib3ac2301b35f33f7ef715c054534136b456605f4\n"
    },
    {
      "commit": "68d06eae7fdee42da33a0ef7bce3585f155067d6",
      "tree": "b6e619648a7f7d91d1908c13f1f0b55813771166",
      "parents": [
        "9934951f3476a2d01d8a4c2a9447f31ba365021d",
        "00645f11812b19a51b459f327221b7b2aa690c08"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Mon Apr 24 22:36:50 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Apr 24 22:36:55 2017 +0000"
      },
      "message": "Merge \"camera: Update for enableZsl values in template\" into oc-dev"
    },
    {
      "commit": "161dc698c7604cfd73310e96503179581822943b",
      "tree": "2acd2a9acd1a46917046266ba7146237384ea152",
      "parents": [
        "b6ed37ed0e1176c3458294abae0ea1b11c30d44f"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Apr 20 16:40:06 2017 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Mon Apr 24 15:25:00 2017 -0700"
      },
      "message": "MediaPlayer: enable more logs for extractor failure.\n\nTest: compiles\nBug: 37273297\nChange-Id: I53c6393e0c306c64ec4aa81c45e5ff6e8de233d8\n"
    },
    {
      "commit": "7d712bb0916182cb73f05ec9144b39314ddd5eab",
      "tree": "44476f17a84bfc14124163cc0311c5f761113c7e",
      "parents": [
        "da540db0fc21bc9319d9602aefe1a109d00a7e6c"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Thu Apr 20 14:23:41 2017 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Mon Apr 24 15:23:03 2017 -0700"
      },
      "message": "VolumeShaper: Clean up constructors\n\nExplicit only for single argument constructors\n\nTest: instrumented ducking, CTS\nBug: 37536598\nChange-Id: I78776f500513a40c8daf7af78cbaec4b153e9ea2\n"
    },
    {
      "commit": "da540db0fc21bc9319d9602aefe1a109d00a7e6c",
      "tree": "4d2bf652c1c8e523ae1bf28bf5e67e20289be6c8",
      "parents": [
        "5551797eb2d813ef01e23eb93fd680bc1e0dd886"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Thu Apr 20 14:06:17 2017 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Mon Apr 24 15:22:44 2017 -0700"
      },
      "message": "VolumeShaper: improve logging and dumpsys\n\nTest: CTS and dumpsys\nBug: 37536598\nChange-Id: I9a838a8605defde3aaf42a872e48f01425df0f0e\n"
    },
    {
      "commit": "c114cbd747142d37ef2e63c7c08976e80ec5a99d",
      "tree": "218dc16b7052ce325e9cd757228516dae539129a",
      "parents": [
        "27a6626537607daa9eff5ee81149602e34101aff",
        "9934951f3476a2d01d8a4c2a9447f31ba365021d"
      ],
      "author": {
        "name": "Dimitry Ivanov",
        "email": "dimitry@google.com",
        "time": "Mon Apr 24 21:23:16 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Apr 24 21:23:16 2017 +0000"
      },
      "message": "Merge \"Allow fstatfs64 syscall for mediacodec/extractor\" into oc-dev\nam: 9934951f34\n\nChange-Id: I8c4bde0c34c8260a7f9493210e25037ac3980264\n"
    },
    {
      "commit": "9934951f3476a2d01d8a4c2a9447f31ba365021d",
      "tree": "890d0966b632833ea5fab63dc040f4c33891616e",
      "parents": [
        "7d25f0f525ffa97687dde3636a354694d59cbf37",
        "1516b02c1a4ab5739bffea9d75ad9b52fc1d5b91"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Mon Apr 24 21:15:21 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Apr 24 21:15:22 2017 +0000"
      },
      "message": "Merge \"Allow fstatfs64 syscall for mediacodec/extractor\" into oc-dev"
    },
    {
      "commit": "27a6626537607daa9eff5ee81149602e34101aff",
      "tree": "64127737522d88bfc73ef7ead16d25e0d1607d8e",
      "parents": [
        "2fbf24446ef97345a49fbd3063c4210685ec22c9",
        "7d25f0f525ffa97687dde3636a354694d59cbf37"
      ],
      "author": {
        "name": "Emilian Peev",
        "email": "epeev@google.com",
        "time": "Mon Apr 24 19:19:39 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Apr 24 19:19:39 2017 +0000"
      },
      "message": "Merge \"Camera: Clear available callback buffers during recording stop\" into oc-dev\nam: 7d25f0f525\n\nChange-Id: I6f4813d76b8d929d40a0e043839055fd73fd36d0\n"
    },
    {
      "commit": "1516b02c1a4ab5739bffea9d75ad9b52fc1d5b91",
      "tree": "38ab09c94fcf556ba6c7669111d03ed5222e5763",
      "parents": [
        "5551797eb2d813ef01e23eb93fd680bc1e0dd886"
      ],
      "author": {
        "name": "Dimitry Ivanov",
        "email": "dimitry@google.com",
        "time": "Mon Apr 24 11:34:58 2017 -0700"
      },
      "committer": {
        "name": "Dimitry Ivanov",
        "email": "dimitry@google.com",
        "time": "Mon Apr 24 12:09:45 2017 -0700"
      },
      "message": "Allow fstatfs64 syscall for mediacodec/extractor\n\nThis syscall is used by the linker to detect files located on tmpfs\n\nBug: http://b/37245203\nBug: http://b/37590327\nTest: boot an angler and check that mediacodec does not crash\nChange-Id: I7147063db7d6b8ec39a25d39b60e8e6882addf6e\n"
    },
    {
      "commit": "7d25f0f525ffa97687dde3636a354694d59cbf37",
      "tree": "fe778b02ab5bbca0bce93f496dfef910b24cf515",
      "parents": [
        "c84e294c4b1cea79d8194898000881fc96c9a8c8",
        "698f0a75c3740ac100b0b3ab89a6ab2453a3dadc"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Mon Apr 24 11:38:28 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Apr 24 11:38:29 2017 +0000"
      },
      "message": "Merge \"Camera: Clear available callback buffers during recording stop\" into oc-dev"
    },
    {
      "commit": "2fbf24446ef97345a49fbd3063c4210685ec22c9",
      "tree": "31d39d3490eaab887114a1976a9b5455328f5025",
      "parents": [
        "e0ca8fcf0bb527ff9c6c53ba5412a4b113118305",
        "c84e294c4b1cea79d8194898000881fc96c9a8c8"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Apr 21 23:03:59 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Apr 21 23:03:59 2017 +0000"
      },
      "message": "Merge \"NuPlayerDecoder: check mCodec before dereferencing it.\" into oc-dev\nam: c84e294c4b\n\nChange-Id: I390ed5b4173d27213e44cea410e2584844609804\n"
    },
    {
      "commit": "c84e294c4b1cea79d8194898000881fc96c9a8c8",
      "tree": "0175d8c8c92994ea86e8c1b3ee32e5543ab58861",
      "parents": [
        "6534425f9f508561928fa5c39dd315fd4c354060",
        "37ff0e6639e90ca49d4f0386a76c09437b459efd"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Fri Apr 21 23:00:47 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Apr 21 23:00:48 2017 +0000"
      },
      "message": "Merge \"NuPlayerDecoder: check mCodec before dereferencing it.\" into oc-dev"
    },
    {
      "commit": "e0ca8fcf0bb527ff9c6c53ba5412a4b113118305",
      "tree": "8a462183611f684b6b6ee1a939646f6836ca5a10",
      "parents": [
        "77252e9772e581874071ca1842756f6bda225548",
        "6534425f9f508561928fa5c39dd315fd4c354060"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Fri Apr 21 18:57:37 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Apr 21 18:57:37 2017 +0000"
      },
      "message": "Merge \"audioflinger: fix mmap stream volume\" into oc-dev\nam: 6534425f9f\n\nChange-Id: Ida39495149ed67c1030c86e3489ddfcbfb76ddc8\n"
    },
    {
      "commit": "77252e9772e581874071ca1842756f6bda225548",
      "tree": "f049738256bd241188f2063c5b8f0b0558b2c0b2",
      "parents": [
        "8c382060fe5633aa96a0357c4fce99af435ea918",
        "6c9b0253d17a34ee23374beaf9a1c5184f276936"
      ],
      "author": {
        "name": "Jesse Hall",
        "email": "jessehall@google.com",
        "time": "Fri Apr 21 18:51:28 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Apr 21 18:51:28 2017 +0000"
      },
      "message": "Merge \"Match AHardwareBuffer format name change\" into oc-dev\nam: 6c9b0253d1\n\nChange-Id: I2fb71cd31b2da6736a38b7e0447aebd7f14f9a76\n"
    },
    {
      "commit": "6534425f9f508561928fa5c39dd315fd4c354060",
      "tree": "ad005e9ce3a46d840acf19e6f75f2220c5283617",
      "parents": [
        "6c9b0253d17a34ee23374beaf9a1c5184f276936",
        "7459b90d769a85a4727a2fc02aa96695454ba652"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Fri Apr 21 18:50:55 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Apr 21 18:50:56 2017 +0000"
      },
      "message": "Merge \"audioflinger: fix mmap stream volume\" into oc-dev"
    },
    {
      "commit": "6c9b0253d17a34ee23374beaf9a1c5184f276936",
      "tree": "f07bca402f5ca412b1867d4a58150580856dcb6f",
      "parents": [
        "4aa3bd0474befeff4d410b5ef5dad630ea4d2879",
        "9b46a4ba85ce8941573344ff515481f318397203"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Fri Apr 21 18:38:19 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Apr 21 18:38:25 2017 +0000"
      },
      "message": "Merge \"Match AHardwareBuffer format name change\" into oc-dev"
    },
    {
      "commit": "37ff0e6639e90ca49d4f0386a76c09437b459efd",
      "tree": "a40d9d2f79dd9e3822335741afb8470efec038fc",
      "parents": [
        "b6ed37ed0e1176c3458294abae0ea1b11c30d44f"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Apr 21 11:24:45 2017 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Apr 21 11:24:45 2017 -0700"
      },
      "message": "NuPlayerDecoder: check mCodec before dereferencing it.\n\nTest: media cts tests\nBug: 37538141\nChange-Id: Ib95fd4786242d6742f3bdc7aab28f79d43e8da81\n"
    },
    {
      "commit": "698f0a75c3740ac100b0b3ab89a6ab2453a3dadc",
      "tree": "8af94c73e7b580c8da1ea7d1719a9ebf5e385d92",
      "parents": [
        "4aa3bd0474befeff4d410b5ef5dad630ea4d2879"
      ],
      "author": {
        "name": "Emilian Peev",
        "email": "epeev@google.com",
        "time": "Wed Apr 05 11:20:09 2017 +0100"
      },
      "committer": {
        "name": "Emilian Peev",
        "email": "epeev@google.com",
        "time": "Fri Apr 21 17:24:44 2017 +0100"
      },
      "message": "Camera: Clear available callback buffers during recording stop\n\nMake sure we don\u0027t keep any stale available callback buffer\nreferences after recording stops. This can lead to resource\nleaks.\n\nBug: 36478361\nTest: Complete Camera/Camera2 CTS tests\nChange-Id: I9f72b784ba3ae1cf9f9b16064a13b7ba8a1d0394\n"
    },
    {
      "commit": "8c382060fe5633aa96a0357c4fce99af435ea918",
      "tree": "32df3afc753706f6b75677d2324d8632a1280515",
      "parents": [
        "9a531d9ac3d5b3254e07d3cd7a3466252232986a",
        "4aa3bd0474befeff4d410b5ef5dad630ea4d2879"
      ],
      "author": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Fri Apr 21 15:38:16 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Apr 21 15:38:16 2017 +0000"
      },
      "message": "Merge \"aaudio: fix SHARED MMAP mode in server plus other bugs\" into oc-dev\nam: 4aa3bd0474\n\nChange-Id: I4bbf45a2232e41a0b8d3ee394e13edc3f1d8c519\n"
    },
    {
      "commit": "4aa3bd0474befeff4d410b5ef5dad630ea4d2879",
      "tree": "9131df14c693833f1df304ffd3800f81ee97e19a",
      "parents": [
        "5b281b66a8efbf7121f96976d36f78ca77bd10c1",
        "71f35bb687476694882a617ba4a810a0bb56fe23"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Fri Apr 21 15:15:49 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Apr 21 15:15:50 2017 +0000"
      },
      "message": "Merge \"aaudio: fix SHARED MMAP mode in server plus other bugs\" into oc-dev"
    },
    {
      "commit": "9a531d9ac3d5b3254e07d3cd7a3466252232986a",
      "tree": "7030c68908b9d4fb58674eedc1d3da395577c8c7",
      "parents": [
        "e21c405358872dca293e0182009fe1b84c41ab3d",
        "5b281b66a8efbf7121f96976d36f78ca77bd10c1"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Fri Apr 21 14:52:54 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Apr 21 14:52:54 2017 +0000"
      },
      "message": "Merge \"Modular DRM for MediaPlayer/SampleAES\" into oc-dev\nam: 5b281b66a8\n\nChange-Id: I9feb07cf505edc7ade8589a42c2fdb167113ddaf\n"
    },
    {
      "commit": "5b281b66a8efbf7121f96976d36f78ca77bd10c1",
      "tree": "017f0554b6cffd940bfcbaa9cfef894d07250ace",
      "parents": [
        "3498c386994dd11530280feaa259587b5dfbee38",
        "3a37f3e948b600405e0c70b8a241778fda44168e"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Fri Apr 21 14:48:55 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Apr 21 14:48:57 2017 +0000"
      },
      "message": "Merge \"Modular DRM for MediaPlayer/SampleAES\" into oc-dev"
    },
    {
      "commit": "e21c405358872dca293e0182009fe1b84c41ab3d",
      "tree": "a34b54a3c4c97626b264a728d0caee35ba48bbe6",
      "parents": [
        "71432b1457aa940e9957a3627ac2727e6b78928b",
        "3498c386994dd11530280feaa259587b5dfbee38"
      ],
      "author": {
        "name": "Pawin Vongmasa",
        "email": "pawin@google.com",
        "time": "Fri Apr 21 10:05:08 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Apr 21 10:05:08 2017 +0000"
      },
      "message": "Merge \"Make IGraphicBufferSource::setTimeLapseConfig take fps\" into oc-dev\nam: 3498c38699\n\nChange-Id: I51dfaed5da8419d962dabb17551f2af6e7915124\n"
    },
    {
      "commit": "3498c386994dd11530280feaa259587b5dfbee38",
      "tree": "d2638fed0a6906305eb41558ff44379b5f62dd44",
      "parents": [
        "a8939b60e238a85237eaa9d9ab6f9cec78f21bb4",
        "22dc508717c7767927064ec7c152def99e54adcb"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Fri Apr 21 09:58:42 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Apr 21 09:58:43 2017 +0000"
      },
      "message": "Merge \"Make IGraphicBufferSource::setTimeLapseConfig take fps\" into oc-dev"
    },
    {
      "commit": "71432b1457aa940e9957a3627ac2727e6b78928b",
      "tree": "91cf40aa62de5353f95921f95d6716a8fc43ec1d",
      "parents": [
        "a30877ac05dee02eff50730ce07941a3b6d18a0c",
        "a8939b60e238a85237eaa9d9ab6f9cec78f21bb4"
      ],
      "author": {
        "name": "Emilian Peev",
        "email": "epeev@google.com",
        "time": "Fri Apr 21 09:32:04 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Apr 21 09:32:04 2017 +0000"
      },
      "message": "Merge \"Camera: Ignore buffer handle \u0027int\u0027 section\" into oc-dev\nam: a8939b60e2\n\nChange-Id: I30c3b1b20c7f85079e3e5e6eeb3cd40362955c30\n"
    },
    {
      "commit": "a8939b60e238a85237eaa9d9ab6f9cec78f21bb4",
      "tree": "7084fa1ee5a4def2f9ace2c5065ba624b5e9f67b",
      "parents": [
        "24059088a46160f731903cc66404184a531d0478",
        "2a6a4689d39b4b4ad1f5d690ac54cce0fd6aae6c"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Fri Apr 21 09:28:55 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Apr 21 09:28:56 2017 +0000"
      },
      "message": "Merge \"Camera: Ignore buffer handle \u0027int\u0027 section\" into oc-dev"
    },
    {
      "commit": "71f35bb687476694882a617ba4a810a0bb56fe23",
      "tree": "93e01bfc7cb0b942e0ee16892c26d5a184b3e541",
      "parents": [
        "24059088a46160f731903cc66404184a531d0478"
      ],
      "author": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Thu Apr 13 16:05:07 2017 -0700"
      },
      "committer": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Fri Apr 21 05:11:26 2017 +0000"
      },
      "message": "aaudio: fix SHARED MMAP mode in server plus other bugs\n\nFixed some buffer miscalculations, and some NPEs in the close() code.\nAdded debugging and some general cleanup.\nFixed data conversion.\nFixed start/pause/flush in server.\nAdded reference counting in server for endpoints.\nPrograms can now be ran more than once.\nGeneral code cleanup.\nReconnect with service if server dies.\nMove stop() logic into server for better synchronization.\nAdd sleep to prevent race condition when closing an MMAP stream.\n\nBug: 33398120\nTest: two write_sine_callback.cpp can be run simultaneously\nChange-Id: Ibb006215a498868c222228d675ff961d7e0bf514\nSigned-off-by: Phil Burk \u003cphilburk@google.com\u003e\n"
    },
    {
      "commit": "7459b90d769a85a4727a2fc02aa96695454ba652",
      "tree": "df9fb1db712ad5fa2219bb081d9152821db53f1b",
      "parents": [
        "24059088a46160f731903cc66404184a531d0478"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Apr 19 18:10:41 2017 -0700"
      },
      "committer": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Fri Apr 21 05:10:54 2017 +0000"
      },
      "message": "audioflinger: fix mmap stream volume\n\nFix bad casting from MmapPlaybackThread to VolumeInterface causing\nvolume commands to be lost by audio flinger for MMAP threads.\n\nBug: 37518243\nTest: Verify volume is received by the audio HAL on MMAP streams\n      Verify no regression for other stream types.\n\nChange-Id: I584ae868245358b2edefecc46a5249092f8be229\n"
    },
    {
      "commit": "a30877ac05dee02eff50730ce07941a3b6d18a0c",
      "tree": "ebe9ba2c4f1ea369b38e3c2c2bf4c75e6fb50d27",
      "parents": [
        "30d1f06d4cb10d98a0424047cd668c1a61200a09",
        "24059088a46160f731903cc66404184a531d0478"
      ],
      "author": {
        "name": "Pawin Vongmasa",
        "email": "pawin@google.com",
        "time": "Fri Apr 21 04:50:47 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Apr 21 04:50:47 2017 +0000"
      },
      "message": "Add future support for IGraphicBufferSource::getStopTimeOffsetUs\nam: 24059088a4\n\nChange-Id: I301609f71c8bd60c6f9fd1275eceb0677bf4b443\n"
    },
    {
      "commit": "22dc508717c7767927064ec7c152def99e54adcb",
      "tree": "7590c5e895632e3a7e8bf20f7a09299f6a1b8dca",
      "parents": [
        "24059088a46160f731903cc66404184a531d0478"
      ],
      "author": {
        "name": "Pawin Vongmasa",
        "email": "pawin@google.com",
        "time": "Thu Apr 20 05:12:55 2017 -0700"
      },
      "committer": {
        "name": "Pawin Vongmasa",
        "email": "pawin@google.com",
        "time": "Thu Apr 20 18:35:08 2017 -0700"
      },
      "message": "Make IGraphicBufferSource::setTimeLapseConfig take fps\n\nTest: Manual use of Camera, Movies, Photos and YouTube apps.\n\nTest: With CtsMediaTestCases.apk installed,\nadb shell am instrument -e size small -w\n\u0027android.media.cts/android.support.test.runner.AndroidJUnitRunner\u0027\n\nBug: 37302530\nChange-Id: Id0d4f7fed57349a2f5484f6b6264981471e8f022\n"
    },
    {
      "commit": "24059088a46160f731903cc66404184a531d0478",
      "tree": "cac78fd7313223a56e287e2b9eaf276aa100648d",
      "parents": [
        "5551797eb2d813ef01e23eb93fd680bc1e0dd886"
      ],
      "author": {
        "name": "Pawin Vongmasa",
        "email": "pawin@google.com",
        "time": "Thu Apr 06 15:56:34 2017 -0700"
      },
      "committer": {
        "name": "Pawin Vongmasa",
        "email": "pawin@google.com",
        "time": "Thu Apr 20 18:07:09 2017 -0700"
      },
      "message": "Add future support for IGraphicBufferSource::getStopTimeOffsetUs\n\nTest: Compiles\nBug: 35925528\nChange-Id: I31368939d2f13811b9e8b3e5911b91b14148c167\n"
    },
    {
      "commit": "3a37f3e948b600405e0c70b8a241778fda44168e",
      "tree": "6e6263f807d39be8cbd975326040d59f320682f2",
      "parents": [
        "5551797eb2d813ef01e23eb93fd680bc1e0dd886"
      ],
      "author": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Wed Apr 19 14:29:42 2017 -0700"
      },
      "committer": {
        "name": "Hassan Shojania",
        "email": "shojania@google.com",
        "time": "Thu Apr 20 11:39:48 2017 -0700"
      },
      "message": "Modular DRM for MediaPlayer/SampleAES\n\nBug: 34559906\nTest: CTS Tests + playback in Chrome\n\nChange-Id: Iaa275c4cfe6d15f02774ff4cc8a2cb5e7d1012e1\n"
    },
    {
      "commit": "30d1f06d4cb10d98a0424047cd668c1a61200a09",
      "tree": "7b50aabbbc6d491fe54cd74cf50e5220e60d5f01",
      "parents": [
        "bacdd3638ef9aebc34db4aa9ec307c089a0c5709",
        "0f3e20f50064bc57a88d2741e04b912a8374485b"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Thu Apr 20 15:19:44 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Apr 20 15:19:44 2017 +0000"
      },
      "message": "Merge \"Convert libcamera_client to Android.bp\" am: f99ffd986c am: 101c5c2327\nam: 0f3e20f500\n\nChange-Id: Id07eb2f7de501af86f5f926bbf3faf8ca9c58a13\n"
    },
    {
      "commit": "bacdd3638ef9aebc34db4aa9ec307c089a0c5709",
      "tree": "226310b9d22ba063a7df3b67e49f839a7487de28",
      "parents": [
        "4ad8cc55d0edc4f8448a404fd3212f1f4a60b2cd",
        "022a83d0eb3bbc42e611205f30de514d6c366db3"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Thu Apr 20 15:19:20 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Apr 20 15:19:20 2017 +0000"
      },
      "message": "Merge \"DO NOT MERGE: Move camera headers to camera/include\" am: 5c3df39520  -s ours am: 37df83b0b3  -s ours\nam: 022a83d0eb  -s ours\n\nChange-Id: I8fedb8960626ad616d53be0cd01fe8b3d2b4be12\n"
    },
    {
      "commit": "0f3e20f50064bc57a88d2741e04b912a8374485b",
      "tree": "6fe329da792c06db1259c6fafef1cd4c93fc1ed5",
      "parents": [
        "022a83d0eb3bbc42e611205f30de514d6c366db3",
        "101c5c2327f316c1554b29d2ddc59021c49fb77f"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Thu Apr 20 15:15:38 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Apr 20 15:15:38 2017 +0000"
      },
      "message": "Merge \"Convert libcamera_client to Android.bp\" am: f99ffd986c\nam: 101c5c2327\n\nChange-Id: I796d8327479e5e88e2491e2ea1c37ec52220384a\n"
    },
    {
      "commit": "022a83d0eb3bbc42e611205f30de514d6c366db3",
      "tree": "0c647513682be153aedc6732c87ccbd9af08ab4f",
      "parents": [
        "235a1fc8832b9be75625234ce4baf2f15c881239",
        "37df83b0b3575a04a0d2b4e6f074fe21a697ae22"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Thu Apr 20 15:15:19 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Apr 20 15:15:19 2017 +0000"
      },
      "message": "Merge \"DO NOT MERGE: Move camera headers to camera/include\" am: 5c3df39520  -s ours\nam: 37df83b0b3  -s ours\n\nChange-Id: I8fd6452735ad0fd710c42d4bfccbc76c75a002e8\n"
    },
    {
      "commit": "101c5c2327f316c1554b29d2ddc59021c49fb77f",
      "tree": "f06ab9a2ab9b3fbe32bfa06a2b36246fd61aa559",
      "parents": [
        "37df83b0b3575a04a0d2b4e6f074fe21a697ae22",
        "f99ffd986c98b9e888678f63202788c59a9867e8"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Thu Apr 20 15:11:23 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Apr 20 15:11:23 2017 +0000"
      },
      "message": "Merge \"Convert libcamera_client to Android.bp\"\nam: f99ffd986c\n\nChange-Id: I14dc96708d919691c047934c2a630cca5f428804\n"
    },
    {
      "commit": "37df83b0b3575a04a0d2b4e6f074fe21a697ae22",
      "tree": "a531773714027793b5a5d12c3ad97e0c3a18205d",
      "parents": [
        "0cc248ee0105d1bddb0ab35c2ffa87732ff4641d",
        "5c3df3952099b15e139ec764980f65336fe23d8a"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Thu Apr 20 15:10:59 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Apr 20 15:10:59 2017 +0000"
      },
      "message": "Merge \"DO NOT MERGE: Move camera headers to camera/include\"\nam: 5c3df39520  -s ours\n\nChange-Id: If34530d184077d4110a0dc0bd6f046c16c3bc267\n"
    },
    {
      "commit": "f99ffd986c98b9e888678f63202788c59a9867e8",
      "tree": "f06ab9a2ab9b3fbe32bfa06a2b36246fd61aa559",
      "parents": [
        "5c3df3952099b15e139ec764980f65336fe23d8a",
        "e7cb781cb8b54f5fb27db05c8b876c9de53f9de2"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Thu Apr 20 15:05:26 2017 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Thu Apr 20 15:05:26 2017 +0000"
      },
      "message": "Merge \"Convert libcamera_client to Android.bp\""
    },
    {
      "commit": "5c3df3952099b15e139ec764980f65336fe23d8a",
      "tree": "a531773714027793b5a5d12c3ad97e0c3a18205d",
      "parents": [
        "32553d9b08f8a56b4da75d67cc3b1ef50895fb4e",
        "0b38a6b7ae3a797bcd383119f9eedd6aa4df4bbf"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Thu Apr 20 15:05:14 2017 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Thu Apr 20 15:05:15 2017 +0000"
      },
      "message": "Merge \"DO NOT MERGE: Move camera headers to camera/include\""
    },
    {
      "commit": "4ad8cc55d0edc4f8448a404fd3212f1f4a60b2cd",
      "tree": "226310b9d22ba063a7df3b67e49f839a7487de28",
      "parents": [
        "d371758dc0fa052fc9ff0d147b51a86ef0cb0f52",
        "4ca485f784820adf5ee8def70d782780e067c7dc"
      ],
      "author": {
        "name": "Vishwath Mohan",
        "email": "vishwath@google.com",
        "time": "Thu Apr 20 14:00:54 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Apr 20 14:00:55 2017 +0000"
      },
      "message": "Merge \"Enable CFI for static media codec libraries.\" into oc-dev-plus-aosp"
    },
    {
      "commit": "d371758dc0fa052fc9ff0d147b51a86ef0cb0f52",
      "tree": "0298ee1e260dd94de487721c0bc9a173bae4cf46",
      "parents": [
        "b484cfd96b42af5bafad5c9f0e4d1c2e999cdaaa",
        "77a5e5a9b50cd2b226945a8599cce044de1173d4"
      ],
      "author": {
        "name": "Vishwath Mohan",
        "email": "vishwath@google.com",
        "time": "Thu Apr 20 14:00:54 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Apr 20 14:00:55 2017 +0000"
      },
      "message": "Merge \"Enable CFI for the amrwbenc test.\" into oc-dev-plus-aosp"
    },
    {
      "commit": "b484cfd96b42af5bafad5c9f0e4d1c2e999cdaaa",
      "tree": "b2103695a786b103a9110cdad1004c9ca5748278",
      "parents": [
        "485f7bebb84bfe7162f88f342fb76ee5c8356920",
        "603ce762d543a3997658c0e9363a50bac3de3ef1"
      ],
      "author": {
        "name": "Vishwath Mohan",
        "email": "vishwath@google.com",
        "time": "Thu Apr 20 14:00:54 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Apr 20 14:00:55 2017 +0000"
      },
      "message": "Merge \"Enable CFI for the amrwbenc software encoder static lib.\" into oc-dev-plus-aosp"
    },
    {
      "commit": "4ca485f784820adf5ee8def70d782780e067c7dc",
      "tree": "3ebe11cd268107beec2e950415d98617d72ba236",
      "parents": [
        "6d97f7160291efa8482dac5f2dc83927492ab786"
      ],
      "author": {
        "name": "Vishwath Mohan",
        "email": "vishwath@google.com",
        "time": "Wed Apr 19 00:21:34 2017 -0700"
      },
      "committer": {
        "name": "Vishwath Mohan",
        "email": "vishwath@google.com",
        "time": "Thu Apr 20 13:50:53 2017 +0000"
      },
      "message": "Enable CFI for static media codec libraries.\n\nThis CL enables CFI for the following components:\n  - media/libstagefright/codecs/aacenc/\n  - media/libstagefright/codecs/m4v_h263/dec/\n  - media/libstagefright/codecs/m4v_h263/enc/\n  - media/libstagefright/codecs/mp3dec/\n  - media/libmediaplayerservice/nuplayer/\n  - media/libstagefright/rtsp/\n\nIn most cases, these changes enable CFI for static libraries that are\nincluded in CFI enabled components.\n\nBug: 30227045\nTest: ENABLE_CFI\u003dtrue m -j40\nTest: Media CTS tests pass.\nChange-Id: I976f5e5629a2c083dd24919ffe33a82967915ecd\n(cherry picked from commit 040dc275896f3aa8e31a8bc5504ca35779c43eed)\n"
    },
    {
      "commit": "77a5e5a9b50cd2b226945a8599cce044de1173d4",
      "tree": "a06fb6cefd91da03e8ff16b1545c5e03b8189ffc",
      "parents": [
        "6d97f7160291efa8482dac5f2dc83927492ab786"
      ],
      "author": {
        "name": "Vishwath Mohan",
        "email": "vishwath@google.com",
        "time": "Wed Apr 19 09:28:28 2017 -0700"
      },
      "committer": {
        "name": "Vishwath Mohan",
        "email": "vishwath@google.com",
        "time": "Thu Apr 20 13:50:43 2017 +0000"
      },
      "message": "Enable CFI for the amrwbenc test.\n\nAdds LOCAL_SANITIZE :\u003d cfi to AMRWBEncTest, which imports the amrwbenc\nstatic lib that now has CFI enabled.\n\nBug: 30227045\nTest: ENABLE_CFI\u003dtrue m -j40 AMRWBEncTest\nChange-Id: Id01f2deb60d0726f451ea12149835923e922e660\n(cherry picked from commit 7e42c68f99bf199f3b0cd9d806d9204d23ab019d)\n"
    },
    {
      "commit": "603ce762d543a3997658c0e9363a50bac3de3ef1",
      "tree": "1d2af98244538b8ad116e0fc95a33f768c2feb6c",
      "parents": [
        "6d97f7160291efa8482dac5f2dc83927492ab786"
      ],
      "author": {
        "name": "Vishwath Mohan",
        "email": "vishwath@google.com",
        "time": "Tue Apr 18 21:34:54 2017 -0700"
      },
      "committer": {
        "name": "Vishwath Mohan",
        "email": "vishwath@google.com",
        "time": "Thu Apr 20 13:50:33 2017 +0000"
      },
      "message": "Enable CFI for the amrwbenc software encoder static lib.\n\nAdds LOCAL_SANITIZE :\u003d cfi to the amrwbenc static library that is\nincluded in libstagefright_soft_amrwbenc.so. This fixes a runtime\ncrash with the software encoder.\n\nBug: 30227045\nTest: \u0027ENABLE_CFI\u003dtrue m -j40\u0027 to build with CFI, then run a GCE AVD\ninstance that uses the software encoder.\nChange-Id: I06721597527e31f33c12baaac4feb409a3fdd0bd\n(cherry picked from commit ef81adc7f64b4ecd74da5bec331c7a1a1062740b)\n"
    },
    {
      "commit": "485f7bebb84bfe7162f88f342fb76ee5c8356920",
      "tree": "a46ab348d0e7b6931be6f11cdf1df86b7f6a4760",
      "parents": [
        "6d97f7160291efa8482dac5f2dc83927492ab786"
      ],
      "author": {
        "name": "Vishwath Mohan",
        "email": "vishwath@google.com",
        "time": "Thu Apr 13 22:32:39 2017 -0700"
      },
      "committer": {
        "name": "Vishwath Mohan",
        "email": "vishwath@google.com",
        "time": "Thu Apr 20 13:50:20 2017 +0000"
      },
      "message": "Enable CFI for more components.\n\nEnables CFI for libmediaplayerservice, and for the testid3 and\nmediafilter executables.\n\nBug: 30227045\nTest: ENABLE_CFI\u003dtrue m -j40 builds and boots\nTest: Media CTS tests pass, testid3 and mediafilter work correctly\nChange-Id: If4cbca00157d5dd63c55a1379cfd83b926f56dbe\n(cherry picked from commit eb3324081bf1062d152b45638bb1b3fed2b71546)\n"
    },
    {
      "commit": "2a6a4689d39b4b4ad1f5d690ac54cce0fd6aae6c",
      "tree": "edf8d6df1cff170dc9327fd46aea8c9f3b37d124",
      "parents": [
        "5551797eb2d813ef01e23eb93fd680bc1e0dd886"
      ],
      "author": {
        "name": "Emilian Peev",
        "email": "epeev@google.com",
        "time": "Thu Apr 20 10:58:51 2017 +0100"
      },
      "committer": {
        "name": "Emilian Peev",
        "email": "epeev@google.com",
        "time": "Thu Apr 20 13:13:59 2017 +0100"
      },
      "message": "Camera: Ignore buffer handle \u0027int\u0027 section\n\nBufer handle hashing and comparison currently uses the buffer\n\u0027Int\u0027 section along with the Fd section. However the values there\ncan dynamically change after the buffer gets allocated which will\nintroduce side-effects in the buffer id map.\n\nBug: 37257356\nTest: Complete Camera/Camera2 CTS\nChange-Id: I2cf09ced69f155285dae67b3a2502e6b87f7d9cc\n"
    },
    {
      "commit": "e7cb781cb8b54f5fb27db05c8b876c9de53f9de2",
      "tree": "69c686bb70393b7fbf230cd00745bc173459b4e0",
      "parents": [
        "0b38a6b7ae3a797bcd383119f9eedd6aa4df4bbf"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Wed Apr 19 19:23:50 2017 -0700"
      },
      "committer": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Wed Apr 19 23:10:35 2017 -0700"
      },
      "message": "Convert libcamera_client to Android.bp\n\nSee build/soong/README.md for more information\n\nTest: m -j checkbuild\nChange-Id: Ie3a82e929ea1e2c271e362bf0fa85f79fa9e9004\n"
    },
    {
      "commit": "6d97f7160291efa8482dac5f2dc83927492ab786",
      "tree": "befab117cdb5000d37ba01a6dd1e38692bb36922",
      "parents": [
        "f11bd40cd2c663b7cf6f7ab3cdf3eaf287dfcf06",
        "235a1fc8832b9be75625234ce4baf2f15c881239"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Thu Apr 20 04:29:05 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Apr 20 04:29:05 2017 +0000"
      },
      "message": "DO NOT MERGE: Move camera headers to camera/include am: 0cc248ee01  -s ours\nam: 235a1fc883  -s ours\n\nChange-Id: Ia2a5b458d4a9ad5d37cb8f0fc68efe2cc569c844\n"
    },
    {
      "commit": "f11bd40cd2c663b7cf6f7ab3cdf3eaf287dfcf06",
      "tree": "befab117cdb5000d37ba01a6dd1e38692bb36922",
      "parents": [
        "bcf7d888d53f37a7f0383064c6ce573d8460ab0e",
        "f0fbc8acc972900f0c259ebccbc22a438967b86e"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Thu Apr 20 04:28:48 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Apr 20 04:28:48 2017 +0000"
      },
      "message": "Merge changes If9daee8f,I09ab3bfc,I854760bd am: 32553d9b08 am: eb0e201c03\nam: f0fbc8acc9\n\nChange-Id: Ibc1decb43140f850cffec48eef022c9c1d108b2d\n"
    },
    {
      "commit": "bcf7d888d53f37a7f0383064c6ce573d8460ab0e",
      "tree": "3554a87cef74b2af1ef39bfab6d443255dbb1e8d",
      "parents": [
        "cfa7fbb4e8241a2684bf1c22ac2209cde3b96c23",
        "d008fd1e4f4cadd300355ece1547ec56d80227dc"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Thu Apr 20 04:28:27 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Apr 20 04:28:27 2017 +0000"
      },
      "message": "DO NOT MERGE: Move camera headers to camera/include\nam: d008fd1e4f  -s ours\n\nChange-Id: I0b367016299210c4d87d30b3278b4aefd6b686eb\n"
    },
    {
      "commit": "235a1fc8832b9be75625234ce4baf2f15c881239",
      "tree": "0c647513682be153aedc6732c87ccbd9af08ab4f",
      "parents": [
        "f0fbc8acc972900f0c259ebccbc22a438967b86e",
        "0cc248ee0105d1bddb0ab35c2ffa87732ff4641d"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Thu Apr 20 04:13:52 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Apr 20 04:13:52 2017 +0000"
      },
      "message": "DO NOT MERGE: Move camera headers to camera/include\nam: 0cc248ee01  -s ours\n\nChange-Id: If43baced29b712d838bd30a9ecba1096ee1b67f9\n"
    },
    {
      "commit": "0b38a6b7ae3a797bcd383119f9eedd6aa4df4bbf",
      "tree": "151d10208e5bc0d1f15f76446db73dfe6c85bb71",
      "parents": [
        "6f2e6b252464097cff52f4a8f77cbad1001bfa3a"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Wed Apr 19 19:49:08 2017 -0700"
      },
      "committer": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Wed Apr 19 20:39:59 2017 -0700"
      },
      "message": "DO NOT MERGE: Move camera headers to camera/include\n\nIn preparation for moving libcamera_client to Soong, this is a backport\nof the camera portion of the change to move headers from include/ into\nthe appropriate directories.\n\ninclude/camera -\u003e camera/include/camera\n\nAdds a symlink from the old location to the new one.\n\nBug: 33241851\nTest: mmma -j frameworks/av/camera\nChange-Id: Ic508c2d0100f4e84b63e745d50eca1402b6fed6c\n(cherry picked from commit d008fd1e4f4cadd300355ece1547ec56d80227dc)\n"
    },
    {
      "commit": "f0fbc8acc972900f0c259ebccbc22a438967b86e",
      "tree": "0c647513682be153aedc6732c87ccbd9af08ab4f",
      "parents": [
        "d008fd1e4f4cadd300355ece1547ec56d80227dc",
        "eb0e201c034cf9e1f389b9d5e1afa5abdd95fa0e"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Thu Apr 20 03:30:35 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Apr 20 03:30:35 2017 +0000"
      },
      "message": "Merge changes If9daee8f,I09ab3bfc,I854760bd am: 32553d9b08\nam: eb0e201c03\n\nChange-Id: Ic73218b2253552c1287d772466d882e12194054e\n"
    },
    {
      "commit": "0cc248ee0105d1bddb0ab35c2ffa87732ff4641d",
      "tree": "a531773714027793b5a5d12c3ad97e0c3a18205d",
      "parents": [
        "eb0e201c034cf9e1f389b9d5e1afa5abdd95fa0e"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Wed Apr 19 19:49:08 2017 -0700"
      },
      "committer": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Thu Apr 20 03:30:24 2017 +0000"
      },
      "message": "DO NOT MERGE: Move camera headers to camera/include\n\nIn preparation for moving libcamera_client to Soong, this is a backport\nof the camera portion of the change to move headers from include/ into\nthe appropriate directories.\n\ninclude/camera -\u003e camera/include/camera\n\nAdds a symlink from the old location to the new one.\n\nBug: 33241851\nTest: mmma -j frameworks/av/camera\nChange-Id: Ic508c2d0100f4e84b63e745d50eca1402b6fed6c\n(cherry picked from commit d008fd1e4f4cadd300355ece1547ec56d80227dc)\n"
    },
    {
      "commit": "eb0e201c034cf9e1f389b9d5e1afa5abdd95fa0e",
      "tree": "7d7f0802c4aab9d1c5e7dce3d20446c6e8064761",
      "parents": [
        "9f6dcf33daf27370e99222a8a7e459525dbd5048",
        "32553d9b08f8a56b4da75d67cc3b1ef50895fb4e"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Thu Apr 20 03:27:30 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Apr 20 03:27:30 2017 +0000"
      },
      "message": "Merge changes If9daee8f,I09ab3bfc,I854760bd\nam: 32553d9b08\n\nChange-Id: I999febe48580a315642cb65d0f87abc0346328d2\n"
    },
    {
      "commit": "32553d9b08f8a56b4da75d67cc3b1ef50895fb4e",
      "tree": "7d7f0802c4aab9d1c5e7dce3d20446c6e8064761",
      "parents": [
        "9696b02782eac6c3ad254347cb0b9d8cf2646134",
        "ac352aab22c1adfb8f5cd62a8d3ac2a507798bfa"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Thu Apr 20 03:21:02 2017 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Thu Apr 20 03:21:04 2017 +0000"
      },
      "message": "Merge changes If9daee8f,I09ab3bfc,I854760bd\n\n* changes:\n  Convert libradio to Android.bp\n  Convert libsoundtrigger to Android.bp\n  Convert libimg_utils to Android.bp\n"
    },
    {
      "commit": "d008fd1e4f4cadd300355ece1547ec56d80227dc",
      "tree": "c9fa16e51eb300719fea8609ec3f85b0de9ec39f",
      "parents": [
        "bf78bff35f69597710f4398651cc3c0b364cd52d"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Wed Apr 19 19:49:08 2017 -0700"
      },
      "committer": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Wed Apr 19 20:00:37 2017 -0700"
      },
      "message": "DO NOT MERGE: Move camera headers to camera/include\n\nIn preparation for moving libcamera_client to Soong, this is a backport\nof the camera portion of the change to move headers from include/ into\nthe appropriate directories.\n\ninclude/camera -\u003e camera/include/camera\n\nAdds a symlink from the old location to the new one.\n\nBug: 33241851\nTest: mmma -j frameworks/av/camera\nChange-Id: Ic508c2d0100f4e84b63e745d50eca1402b6fed6c\n"
    }
  ],
  "next": "ac352aab22c1adfb8f5cd62a8d3ac2a507798bfa"
}
