)]}'
{
  "log": [
    {
      "commit": "29152617e8bb445521b7fd2b1bcce88b9ecf48cc",
      "tree": "b584d660f25525a79993513fcd55ec227207ee67",
      "parents": [
        "7a06b60f697ba0729ad3a2230529a7b493b9cfb4",
        "1ebe2d794e87269798c638b13088b4845441c236"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Aug 10 08:55:43 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Aug 10 08:55:43 2012 -0700"
      },
      "message": "am 1ebe2d79: (-s ours) Reconcile with jb-mr1-release - do not merge\n\n* commit \u00271ebe2d794e87269798c638b13088b4845441c236\u0027:\n"
    },
    {
      "commit": "1ebe2d794e87269798c638b13088b4845441c236",
      "tree": "1736b17912ab0a04881d8e5634a4968077e3d1d6",
      "parents": [
        "8f8bffd61352915af9d7af6d0279ada039a58d7e",
        "a0f3d222a6dafd9a7011717d385291285614667e"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Aug 10 08:52:25 2012 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Aug 10 08:52:25 2012 -0700"
      },
      "message": "Reconcile with jb-mr1-release - do not merge\n\nChange-Id: I25b62743f7c6675fa7c43a6499be01ec49de04db\n"
    },
    {
      "commit": "7a06b60f697ba0729ad3a2230529a7b493b9cfb4",
      "tree": "b584d660f25525a79993513fcd55ec227207ee67",
      "parents": [
        "e9103a17dd0957e3dd21c2b424e03ac79faf4192",
        "8f8bffd61352915af9d7af6d0279ada039a58d7e"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Thu Aug 09 13:51:50 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 09 13:51:50 2012 -0700"
      },
      "message": "am 8f8bffd6: am faa88edb: Merge \"Fix static sample table processing, add support for h.263 video.\" into jb-mr1-dev\n\n* commit \u00278f8bffd61352915af9d7af6d0279ada039a58d7e\u0027:\n  Fix static sample table processing, add support for h.263 video.\n"
    },
    {
      "commit": "8f8bffd61352915af9d7af6d0279ada039a58d7e",
      "tree": "1736b17912ab0a04881d8e5634a4968077e3d1d6",
      "parents": [
        "744100a9bc552975ef55da220910c8a05aa17bdc",
        "faa88edb9df91b0e7725b0ee4c4fb5e92262b3d5"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Thu Aug 09 13:50:14 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 09 13:50:14 2012 -0700"
      },
      "message": "am faa88edb: Merge \"Fix static sample table processing, add support for h.263 video.\" into jb-mr1-dev\n\n* commit \u0027faa88edb9df91b0e7725b0ee4c4fb5e92262b3d5\u0027:\n  Fix static sample table processing, add support for h.263 video.\n"
    },
    {
      "commit": "faa88edb9df91b0e7725b0ee4c4fb5e92262b3d5",
      "tree": "1736b17912ab0a04881d8e5634a4968077e3d1d6",
      "parents": [
        "9352d1168c09903d4ea27b695ef683316c544ae5",
        "b9787142c5f5f8f47e7e35409f4f2ef7112ab72e"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Thu Aug 09 13:48:49 2012 -0700"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Aug 09 13:48:49 2012 -0700"
      },
      "message": "Merge \"Fix static sample table processing, add support for h.263 video.\" into jb-mr1-dev"
    },
    {
      "commit": "b9787142c5f5f8f47e7e35409f4f2ef7112ab72e",
      "tree": "3966271224e78b6d8e88da104385a67900890635",
      "parents": [
        "0d27c65ddb5c968baa6db0c26e80f5c451bc52bc"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Thu Aug 09 09:15:48 2012 -0700"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Thu Aug 09 13:25:48 2012 -0700"
      },
      "message": "Fix static sample table processing, add support for h.263 video.\n\nChange-Id: I5628d3437b5e6f8836d78557fd07ab87e5a914e3\n"
    },
    {
      "commit": "e9103a17dd0957e3dd21c2b424e03ac79faf4192",
      "tree": "352314f6f24ada89cad9dbfbfddb8350840d7235",
      "parents": [
        "e75640c4b06a5715622eeffd8d204f811284fd8c",
        "744100a9bc552975ef55da220910c8a05aa17bdc"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Thu Aug 09 11:52:10 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 09 11:52:10 2012 -0700"
      },
      "message": "am 744100a9: am 9352d116: Remove some unused forward lock code\n\n* commit \u0027744100a9bc552975ef55da220910c8a05aa17bdc\u0027:\n  Remove some unused forward lock code\n"
    },
    {
      "commit": "744100a9bc552975ef55da220910c8a05aa17bdc",
      "tree": "8a5d71edb9d565bf0e7d671abe08d059a933e35f",
      "parents": [
        "638f936d4dd0d4afdc952988ac6b6a9dcbb577e7",
        "9352d1168c09903d4ea27b695ef683316c544ae5"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Thu Aug 09 11:50:50 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 09 11:50:50 2012 -0700"
      },
      "message": "am 9352d116: Remove some unused forward lock code\n\n* commit \u00279352d1168c09903d4ea27b695ef683316c544ae5\u0027:\n  Remove some unused forward lock code\n"
    },
    {
      "commit": "a0f3d222a6dafd9a7011717d385291285614667e",
      "tree": "62cdadd7e272d5f5f5f187767984ecb0c12b5080",
      "parents": [
        "0d27c65ddb5c968baa6db0c26e80f5c451bc52bc",
        "ba668e07d2ab01a95a9ef941e17483199d53ffe8"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Thu Aug 09 09:29:48 2012 -0700"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Thu Aug 09 09:29:48 2012 -0700"
      },
      "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n"
    },
    {
      "commit": "9352d1168c09903d4ea27b695ef683316c544ae5",
      "tree": "8a5d71edb9d565bf0e7d671abe08d059a933e35f",
      "parents": [
        "0d27c65ddb5c968baa6db0c26e80f5c451bc52bc"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Aug 08 17:19:18 2012 -0700"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Aug 08 17:20:28 2012 -0700"
      },
      "message": "Remove some unused forward lock code\n\nChange-Id: I94d01f6ad5b1676cc4d6a95807e166f3c25aa79c\n"
    },
    {
      "commit": "e75640c4b06a5715622eeffd8d204f811284fd8c",
      "tree": "ca1f546b5da34856c906a736c0eb7942bf9b3b22",
      "parents": [
        "f768ada0f9eeaaaf9847da7a432375aed4d95828",
        "638f936d4dd0d4afdc952988ac6b6a9dcbb577e7"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Aug 08 15:11:50 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 15:11:50 2012 -0700"
      },
      "message": "am 638f936d: am 0d27c65d: Tune the overrun correction\n\n* commit \u0027638f936d4dd0d4afdc952988ac6b6a9dcbb577e7\u0027:\n  Tune the overrun correction\n"
    },
    {
      "commit": "f768ada0f9eeaaaf9847da7a432375aed4d95828",
      "tree": "9c3e8e9f419cd1e8c06d27a4c6082115aad89c6b",
      "parents": [
        "3c507a754788872bdc19aa651180447c5456f191",
        "fc9d21b02aa5d0da6954084c16a9928b50b92426"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 15:11:29 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 15:11:29 2012 -0700"
      },
      "message": "am fc9d21b0: am e983aa4f: am 51af4af2: am e28df5b9: Merge \"Store correct time stamps in recorded mp4 files\"\n\n* commit \u0027fc9d21b02aa5d0da6954084c16a9928b50b92426\u0027:\n  Store correct time stamps in recorded mp4 files\n"
    },
    {
      "commit": "3c507a754788872bdc19aa651180447c5456f191",
      "tree": "ed6d6a85a55ad3ec4a5879ee4c2e4dabc8ff515a",
      "parents": [
        "0d8b4d87a797963c0549284251a179b66da56316",
        "acc5c275f6affe789184436b7d40fb1656a4596f"
      ],
      "author": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Wed Aug 08 15:10:49 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 15:10:49 2012 -0700"
      },
      "message": "am acc5c275: am f6a35760: Merge \"AudioFlinger: fix timed audio\" into jb-mr1-dev\n\n* commit \u0027acc5c275f6affe789184436b7d40fb1656a4596f\u0027:\n  AudioFlinger: fix timed audio\n"
    },
    {
      "commit": "0d8b4d87a797963c0549284251a179b66da56316",
      "tree": "a42144733930031e9a8d0adaf435fece2902793e",
      "parents": [
        "6daac44d5b1ff64086a616623af3740973fe2cde",
        "e5262c7f7ccd75c3e857081b947d62788d979e0c"
      ],
      "author": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Wed Aug 08 15:10:48 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 15:10:48 2012 -0700"
      },
      "message": "am e5262c7f: am 6febe17c: Merge \"AudioFlinger: Better handling for master volume/mute\" into jb-mr1-dev\n\n* commit \u0027e5262c7f7ccd75c3e857081b947d62788d979e0c\u0027:\n  AudioFlinger: Better handling for master volume/mute\n"
    },
    {
      "commit": "6daac44d5b1ff64086a616623af3740973fe2cde",
      "tree": "a42144733930031e9a8d0adaf435fece2902793e",
      "parents": [
        "1a02d11d0bae1118d7d8f2a6674f6f21ec3f64ff",
        "952f6bf80858c1ef3543d9b93fa04a5a175f2026"
      ],
      "author": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Wed Aug 08 15:10:47 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 15:10:47 2012 -0700"
      },
      "message": "am 952f6bf8: (-s ours) am 3f0b1eaa: Merge \"Change audio flinger to user HAL master mute if available\" into jb-mr1-dev\n\n* commit \u0027952f6bf80858c1ef3543d9b93fa04a5a175f2026\u0027:\n  Change audio flinger to user HAL master mute if available\n"
    },
    {
      "commit": "638f936d4dd0d4afdc952988ac6b6a9dcbb577e7",
      "tree": "62cdadd7e272d5f5f5f187767984ecb0c12b5080",
      "parents": [
        "fc9d21b02aa5d0da6954084c16a9928b50b92426",
        "0d27c65ddb5c968baa6db0c26e80f5c451bc52bc"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Aug 08 14:37:39 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 14:37:39 2012 -0700"
      },
      "message": "am 0d27c65d: Tune the overrun correction\n\n* commit \u00270d27c65ddb5c968baa6db0c26e80f5c451bc52bc\u0027:\n  Tune the overrun correction\n"
    },
    {
      "commit": "0d27c65ddb5c968baa6db0c26e80f5c451bc52bc",
      "tree": "62cdadd7e272d5f5f5f187767984ecb0c12b5080",
      "parents": [
        "e983aa4ff4d80af7702888e230b9aaa93a7b7e57"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Aug 07 10:38:59 2012 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Aug 08 14:28:42 2012 -0700"
      },
      "message": "Tune the overrun correction\n\nThe new overrun correction is: if the previous write() cycle time is \u003c\n50% of expected, then sleep enough extra to make the total cycle time \u003d\n95% of expected.  This should help compensate for HAL implementations\nthat have uneven cycle times due to sample rate conversion.\n\nBug: 6881638\nChange-Id: I5ab58afdfceee7ac523177f021fbf62d743d571a\n"
    },
    {
      "commit": "fc9d21b02aa5d0da6954084c16a9928b50b92426",
      "tree": "09e62e3a573248dd1a3c7b2dae082810f16dfe79",
      "parents": [
        "acc5c275f6affe789184436b7d40fb1656a4596f",
        "e983aa4ff4d80af7702888e230b9aaa93a7b7e57"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 14:10:43 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 14:10:43 2012 -0700"
      },
      "message": "am e983aa4f: am 51af4af2: am e28df5b9: Merge \"Store correct time stamps in recorded mp4 files\"\n\n* commit \u0027e983aa4ff4d80af7702888e230b9aaa93a7b7e57\u0027:\n  Store correct time stamps in recorded mp4 files\n"
    },
    {
      "commit": "e983aa4ff4d80af7702888e230b9aaa93a7b7e57",
      "tree": "09e62e3a573248dd1a3c7b2dae082810f16dfe79",
      "parents": [
        "f6a3576006f3fbe7d87ab49c1ebf292be5ddaa24",
        "51af4af2414cdaaf0185b971a41fc0b4f8c0b7e4"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 14:08:28 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 14:08:28 2012 -0700"
      },
      "message": "am 51af4af2: am e28df5b9: Merge \"Store correct time stamps in recorded mp4 files\"\n\n* commit \u002751af4af2414cdaaf0185b971a41fc0b4f8c0b7e4\u0027:\n  Store correct time stamps in recorded mp4 files\n"
    },
    {
      "commit": "51af4af2414cdaaf0185b971a41fc0b4f8c0b7e4",
      "tree": "3e7a2ca1401597ed506a8725e8a0934a28404024",
      "parents": [
        "ef62009372d050b431939835d4e2c5ee77da8831",
        "e28df5b996af3480b457c7a9908dbb9d52ad8d7c"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 14:04:18 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 14:04:18 2012 -0700"
      },
      "message": "am e28df5b9: Merge \"Store correct time stamps in recorded mp4 files\"\n\n* commit \u0027e28df5b996af3480b457c7a9908dbb9d52ad8d7c\u0027:\n  Store correct time stamps in recorded mp4 files\n"
    },
    {
      "commit": "e28df5b996af3480b457c7a9908dbb9d52ad8d7c",
      "tree": "ab1896ce5aa5df33cce6f0f4101262b299633fe7",
      "parents": [
        "efee009528f446542d51f1ce50e2189e8a2f71dd",
        "efcdf187baab9ec29e12adcf85e63fe3e6d5aa4d"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:40:33 2012 -0700"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Aug 08 13:40:34 2012 -0700"
      },
      "message": "Merge \"Store correct time stamps in recorded mp4 files\""
    },
    {
      "commit": "1a02d11d0bae1118d7d8f2a6674f6f21ec3f64ff",
      "tree": "a42144733930031e9a8d0adaf435fece2902793e",
      "parents": [
        "19678334c346f207a98aa67898c3618569e47f8b",
        "eb8cffd91add5dafd12d58611b494172aad9b07e"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:15:44 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:15:44 2012 -0700"
      },
      "message": "am eb8cffd9: am 1e357f46: am ef620093: am efee0095: Merge \"Correct ID3::StringSize calculation for UCS-2 data.\"\n\n* commit \u0027eb8cffd91add5dafd12d58611b494172aad9b07e\u0027:\n  Correct ID3::StringSize calculation for UCS-2 data.\n"
    },
    {
      "commit": "19678334c346f207a98aa67898c3618569e47f8b",
      "tree": "7a8a1bafba56ae91b993d2f40172862740717544",
      "parents": [
        "9326e74cb592cc204bba7c38960b9235c4c680cf",
        "88ed043d320a8771b102f984e57a88e372b4b934"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:15:43 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:15:43 2012 -0700"
      },
      "message": "am 88ed043d: am 4bb0e2aa: am 662b15c3: am a858aa96: Merge \"avcenc: Remove redundant zero-initialization of allocated memory\"\n\n* commit \u002788ed043d320a8771b102f984e57a88e372b4b934\u0027:\n  avcenc: Remove redundant zero-initialization of allocated memory\n"
    },
    {
      "commit": "9326e74cb592cc204bba7c38960b9235c4c680cf",
      "tree": "5e5c1dd35e6e72229e2b58275eb8cea2bd9a8b90",
      "parents": [
        "d32a2c0a9a7b199046679510ba94ae7c44f1aaa7",
        "dadf369042250e6e96a745526e8f27db3d3ce71c"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:15:42 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:15:42 2012 -0700"
      },
      "message": "am dadf3690: am 49e74946: am 44237a8d: am b71298ee: Merge \"avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function\"\n\n* commit \u0027dadf369042250e6e96a745526e8f27db3d3ce71c\u0027:\n  avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function\n"
    },
    {
      "commit": "d32a2c0a9a7b199046679510ba94ae7c44f1aaa7",
      "tree": "a2c1271e7ab472fc9f62dd379a251a8f25ec9f21",
      "parents": [
        "660def30bd7d431cb50a592823a49c4301957ad0",
        "1a562740beb85b1a90fc7f44a7b86cd7f0862810"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:15:41 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:15:41 2012 -0700"
      },
      "message": "am 1a562740: am f5a66877: am 68d44b06: am 0ab18f85: Merge \"avcenc: Remove useless casts\"\n\n* commit \u00271a562740beb85b1a90fc7f44a7b86cd7f0862810\u0027:\n  avcenc: Remove useless casts\n"
    },
    {
      "commit": "660def30bd7d431cb50a592823a49c4301957ad0",
      "tree": "91469d691a2b53cc9e1dcdf1c2f2560e494ebefc",
      "parents": [
        "2d8f9d4a3378775ce0b4fda0a61101f686e37ae9",
        "7cad90adba8f7a097488297afce4466985dc5b58"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:15:40 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:15:40 2012 -0700"
      },
      "message": "am 7cad90ad: am 76d46c5a: am 4348cbce: am 67f694d6: Merge \"Initialize pool\\\u0027s buffer pointers to null.\"\n\n* commit \u00277cad90adba8f7a097488297afce4466985dc5b58\u0027:\n  Initialize pool\u0027s buffer pointers to null.\n"
    },
    {
      "commit": "2d8f9d4a3378775ce0b4fda0a61101f686e37ae9",
      "tree": "ededf30368a4aa8e18b70fdf01b62856da024405",
      "parents": [
        "9708722dca3c87a69ef9d56523a8b76ce5afd198",
        "6f29245e6e4b882bb01e2ee9b120469df27970b2"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:15:39 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:15:39 2012 -0700"
      },
      "message": "am 6f29245e: am 93f902d5: am 96d18cca: am 0822156c: Merge \"avcenc: Fix indentation\"\n\n* commit \u00276f29245e6e4b882bb01e2ee9b120469df27970b2\u0027:\n  avcenc: Fix indentation\n"
    },
    {
      "commit": "9708722dca3c87a69ef9d56523a8b76ce5afd198",
      "tree": "76a7889fa06493178219793f95ac9a7c3ccc81fc",
      "parents": [
        "5f467a5c7e63734cdff3560b74ca90f2440a75ed",
        "013c9c324e281857ca584b7d092026b3062aedca"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:15:38 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:15:38 2012 -0700"
      },
      "message": "am 013c9c32: am 3269b531: am 80c46255: am 874a074a: Merge \"avcenc: Switch malloc/free callbacks to use pointers instead of ints\"\n\n* commit \u0027013c9c324e281857ca584b7d092026b3062aedca\u0027:\n  avcenc: Switch malloc/free callbacks to use pointers instead of ints\n"
    },
    {
      "commit": "5f467a5c7e63734cdff3560b74ca90f2440a75ed",
      "tree": "75aaf19b9286eed494ad90d68503049adcc94549",
      "parents": [
        "b58d58353bfedb98238f58892f9cac252a5d0c45",
        "a018268b84bcf72d346f466c401f9fda6ce506bb"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:15:37 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:15:37 2012 -0700"
      },
      "message": "am a018268b: am c107387c: am 17fa4ab4: am b7ee9c44: Merge \"mediacodec: Return an error on getOutputFormat if there is no output format yet\"\n\n* commit \u0027a018268b84bcf72d346f466c401f9fda6ce506bb\u0027:\n  mediacodec: Return an error on getOutputFormat if there is no output format yet\n"
    },
    {
      "commit": "acc5c275f6affe789184436b7d40fb1656a4596f",
      "tree": "d6e71ed32e4a638b1a88fd4a86f4ca0cf4d2c1c5",
      "parents": [
        "e5262c7f7ccd75c3e857081b947d62788d979e0c",
        "f6a3576006f3fbe7d87ab49c1ebf292be5ddaa24"
      ],
      "author": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Wed Aug 08 13:13:34 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:13:34 2012 -0700"
      },
      "message": "am f6a35760: Merge \"AudioFlinger: fix timed audio\" into jb-mr1-dev\n\n* commit \u0027f6a3576006f3fbe7d87ab49c1ebf292be5ddaa24\u0027:\n  AudioFlinger: fix timed audio\n"
    },
    {
      "commit": "e5262c7f7ccd75c3e857081b947d62788d979e0c",
      "tree": "4c9302b28fb6141441700ad048d4daa770d94c94",
      "parents": [
        "952f6bf80858c1ef3543d9b93fa04a5a175f2026",
        "6febe17ce31636d07ef6305cf1045a0b942b4f11"
      ],
      "author": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Wed Aug 08 13:13:33 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:13:33 2012 -0700"
      },
      "message": "am 6febe17c: Merge \"AudioFlinger: Better handling for master volume/mute\" into jb-mr1-dev\n\n* commit \u00276febe17ce31636d07ef6305cf1045a0b942b4f11\u0027:\n  AudioFlinger: Better handling for master volume/mute\n"
    },
    {
      "commit": "952f6bf80858c1ef3543d9b93fa04a5a175f2026",
      "tree": "450bbb9c8800d474972a8b566f500af17af0969a",
      "parents": [
        "eb8cffd91add5dafd12d58611b494172aad9b07e",
        "3f0b1eaa411c15f05cc591e9de617bd41c9daad1"
      ],
      "author": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Wed Aug 08 13:13:32 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:13:32 2012 -0700"
      },
      "message": "am 3f0b1eaa: Merge \"Change audio flinger to user HAL master mute if available\" into jb-mr1-dev\n\n* commit \u00273f0b1eaa411c15f05cc591e9de617bd41c9daad1\u0027:\n  Change audio flinger to user HAL master mute if available\n"
    },
    {
      "commit": "eb8cffd91add5dafd12d58611b494172aad9b07e",
      "tree": "e158c52828130a41acece15ac9b4f10ea39587ff",
      "parents": [
        "88ed043d320a8771b102f984e57a88e372b4b934",
        "1e357f4610e788c3e5dea5dd2f01b26bb75c5e36"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:13:31 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:13:31 2012 -0700"
      },
      "message": "am 1e357f46: am ef620093: am efee0095: Merge \"Correct ID3::StringSize calculation for UCS-2 data.\"\n\n* commit \u00271e357f4610e788c3e5dea5dd2f01b26bb75c5e36\u0027:\n  Correct ID3::StringSize calculation for UCS-2 data.\n"
    },
    {
      "commit": "88ed043d320a8771b102f984e57a88e372b4b934",
      "tree": "0847f62c311f5875d39214604ab4d3403341de60",
      "parents": [
        "dadf369042250e6e96a745526e8f27db3d3ce71c",
        "4bb0e2aa1410191a8cff1f921d1b246232ed42e9"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:13:30 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:13:30 2012 -0700"
      },
      "message": "am 4bb0e2aa: am 662b15c3: am a858aa96: Merge \"avcenc: Remove redundant zero-initialization of allocated memory\"\n\n* commit \u00274bb0e2aa1410191a8cff1f921d1b246232ed42e9\u0027:\n  avcenc: Remove redundant zero-initialization of allocated memory\n"
    },
    {
      "commit": "dadf369042250e6e96a745526e8f27db3d3ce71c",
      "tree": "ad58044e45949e2b1283beeb3dbc580b677f1d28",
      "parents": [
        "1a562740beb85b1a90fc7f44a7b86cd7f0862810",
        "49e74946370e7af2378e28733ba6d8df8951b068"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:13:29 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:13:29 2012 -0700"
      },
      "message": "am 49e74946: am 44237a8d: am b71298ee: Merge \"avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function\"\n\n* commit \u002749e74946370e7af2378e28733ba6d8df8951b068\u0027:\n  avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function\n"
    },
    {
      "commit": "1a562740beb85b1a90fc7f44a7b86cd7f0862810",
      "tree": "2b7107ac5ff90e4bf9d7fc44522f677a2368bab2",
      "parents": [
        "7cad90adba8f7a097488297afce4466985dc5b58",
        "f5a66877655695af619909db6c831f78373d733e"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:13:28 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:13:28 2012 -0700"
      },
      "message": "am f5a66877: am 68d44b06: am 0ab18f85: Merge \"avcenc: Remove useless casts\"\n\n* commit \u0027f5a66877655695af619909db6c831f78373d733e\u0027:\n  avcenc: Remove useless casts\n"
    },
    {
      "commit": "7cad90adba8f7a097488297afce4466985dc5b58",
      "tree": "1f7b6cda17f89f50f1447fd50f0a23c3264543c7",
      "parents": [
        "6f29245e6e4b882bb01e2ee9b120469df27970b2",
        "76d46c5a3637d6ac9e664c449839befbbd09c0a0"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:13:27 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:13:27 2012 -0700"
      },
      "message": "am 76d46c5a: am 4348cbce: am 67f694d6: Merge \"Initialize pool\\\u0027s buffer pointers to null.\"\n\n* commit \u002776d46c5a3637d6ac9e664c449839befbbd09c0a0\u0027:\n  Initialize pool\u0027s buffer pointers to null.\n"
    },
    {
      "commit": "6f29245e6e4b882bb01e2ee9b120469df27970b2",
      "tree": "7ec6e8769cc9863a74e83f303d6b122172db4e0d",
      "parents": [
        "013c9c324e281857ca584b7d092026b3062aedca",
        "93f902d58cd287e8dd046621824b7de7aa985d36"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:13:26 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:13:26 2012 -0700"
      },
      "message": "am 93f902d5: am 96d18cca: am 0822156c: Merge \"avcenc: Fix indentation\"\n\n* commit \u002793f902d58cd287e8dd046621824b7de7aa985d36\u0027:\n  avcenc: Fix indentation\n"
    },
    {
      "commit": "013c9c324e281857ca584b7d092026b3062aedca",
      "tree": "6720852bc5377b410f2f279f5462fbd20cc7a9ad",
      "parents": [
        "a018268b84bcf72d346f466c401f9fda6ce506bb",
        "3269b5314f02eb3724be8d45880f15762fac09c0"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:13:26 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:13:26 2012 -0700"
      },
      "message": "am 3269b531: am 80c46255: am 874a074a: Merge \"avcenc: Switch malloc/free callbacks to use pointers instead of ints\"\n\n* commit \u00273269b5314f02eb3724be8d45880f15762fac09c0\u0027:\n  avcenc: Switch malloc/free callbacks to use pointers instead of ints\n"
    },
    {
      "commit": "a018268b84bcf72d346f466c401f9fda6ce506bb",
      "tree": "ae5bd9610d447e33a9526499d8f765381b65376d",
      "parents": [
        "5ed3e21fdc33dee41ab9a5cb61a02e6a048168a8",
        "c107387cef844aabad80ea1430bb768c2605e89f"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:13:25 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:13:25 2012 -0700"
      },
      "message": "am c107387c: am 17fa4ab4: am b7ee9c44: Merge \"mediacodec: Return an error on getOutputFormat if there is no output format yet\"\n\n* commit \u0027c107387cef844aabad80ea1430bb768c2605e89f\u0027:\n  mediacodec: Return an error on getOutputFormat if there is no output format yet\n"
    },
    {
      "commit": "f6a3576006f3fbe7d87ab49c1ebf292be5ddaa24",
      "tree": "d6e71ed32e4a638b1a88fd4a86f4ca0cf4d2c1c5",
      "parents": [
        "6febe17ce31636d07ef6305cf1045a0b942b4f11",
        "2c3b2da3049627264b7c6b449a1622f002210f03"
      ],
      "author": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Wed Aug 08 13:12:25 2012 -0700"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Aug 08 13:12:25 2012 -0700"
      },
      "message": "Merge \"AudioFlinger: fix timed audio\" into jb-mr1-dev"
    },
    {
      "commit": "6febe17ce31636d07ef6305cf1045a0b942b4f11",
      "tree": "4c9302b28fb6141441700ad048d4daa770d94c94",
      "parents": [
        "3f0b1eaa411c15f05cc591e9de617bd41c9daad1",
        "ee578c0330319f04a48bccbdb26b53fea0388d04"
      ],
      "author": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Wed Aug 08 13:12:09 2012 -0700"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Aug 08 13:12:09 2012 -0700"
      },
      "message": "Merge \"AudioFlinger: Better handling for master volume/mute\" into jb-mr1-dev"
    },
    {
      "commit": "3f0b1eaa411c15f05cc591e9de617bd41c9daad1",
      "tree": "450bbb9c8800d474972a8b566f500af17af0969a",
      "parents": [
        "1e357f4610e788c3e5dea5dd2f01b26bb75c5e36",
        "d8f178d613821c3f61a5c5e391eb275339e526a9"
      ],
      "author": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Wed Aug 08 13:11:55 2012 -0700"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Aug 08 13:11:55 2012 -0700"
      },
      "message": "Merge \"Change audio flinger to user HAL master mute if available\" into jb-mr1-dev"
    },
    {
      "commit": "1e357f4610e788c3e5dea5dd2f01b26bb75c5e36",
      "tree": "e158c52828130a41acece15ac9b4f10ea39587ff",
      "parents": [
        "4bb0e2aa1410191a8cff1f921d1b246232ed42e9",
        "ef62009372d050b431939835d4e2c5ee77da8831"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:11:20 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:11:20 2012 -0700"
      },
      "message": "am ef620093: am efee0095: Merge \"Correct ID3::StringSize calculation for UCS-2 data.\"\n\n* commit \u0027ef62009372d050b431939835d4e2c5ee77da8831\u0027:\n  Correct ID3::StringSize calculation for UCS-2 data.\n"
    },
    {
      "commit": "4bb0e2aa1410191a8cff1f921d1b246232ed42e9",
      "tree": "0847f62c311f5875d39214604ab4d3403341de60",
      "parents": [
        "49e74946370e7af2378e28733ba6d8df8951b068",
        "662b15c377e1ebe6aed8ff5cf82c684f0c8894dc"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:11:19 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:11:19 2012 -0700"
      },
      "message": "am 662b15c3: am a858aa96: Merge \"avcenc: Remove redundant zero-initialization of allocated memory\"\n\n* commit \u0027662b15c377e1ebe6aed8ff5cf82c684f0c8894dc\u0027:\n  avcenc: Remove redundant zero-initialization of allocated memory\n"
    },
    {
      "commit": "49e74946370e7af2378e28733ba6d8df8951b068",
      "tree": "ad58044e45949e2b1283beeb3dbc580b677f1d28",
      "parents": [
        "f5a66877655695af619909db6c831f78373d733e",
        "44237a8d58dc218257687f2cbe8fd33d73a713e8"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:11:18 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:11:18 2012 -0700"
      },
      "message": "am 44237a8d: am b71298ee: Merge \"avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function\"\n\n* commit \u002744237a8d58dc218257687f2cbe8fd33d73a713e8\u0027:\n  avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function\n"
    },
    {
      "commit": "f5a66877655695af619909db6c831f78373d733e",
      "tree": "2b7107ac5ff90e4bf9d7fc44522f677a2368bab2",
      "parents": [
        "76d46c5a3637d6ac9e664c449839befbbd09c0a0",
        "68d44b061e92fb6832240457d4f683635bf5328f"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:11:17 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:11:17 2012 -0700"
      },
      "message": "am 68d44b06: am 0ab18f85: Merge \"avcenc: Remove useless casts\"\n\n* commit \u002768d44b061e92fb6832240457d4f683635bf5328f\u0027:\n  avcenc: Remove useless casts\n"
    },
    {
      "commit": "76d46c5a3637d6ac9e664c449839befbbd09c0a0",
      "tree": "1f7b6cda17f89f50f1447fd50f0a23c3264543c7",
      "parents": [
        "93f902d58cd287e8dd046621824b7de7aa985d36",
        "4348cbcec6c3aec02af722d633ebda24f94dfcc8"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:11:16 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:11:16 2012 -0700"
      },
      "message": "am 4348cbce: am 67f694d6: Merge \"Initialize pool\\\u0027s buffer pointers to null.\"\n\n* commit \u00274348cbcec6c3aec02af722d633ebda24f94dfcc8\u0027:\n  Initialize pool\u0027s buffer pointers to null.\n"
    },
    {
      "commit": "93f902d58cd287e8dd046621824b7de7aa985d36",
      "tree": "7ec6e8769cc9863a74e83f303d6b122172db4e0d",
      "parents": [
        "3269b5314f02eb3724be8d45880f15762fac09c0",
        "96d18cca4546045df118660017e74ddd751dfbb4"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:11:15 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:11:15 2012 -0700"
      },
      "message": "am 96d18cca: am 0822156c: Merge \"avcenc: Fix indentation\"\n\n* commit \u002796d18cca4546045df118660017e74ddd751dfbb4\u0027:\n  avcenc: Fix indentation\n"
    },
    {
      "commit": "3269b5314f02eb3724be8d45880f15762fac09c0",
      "tree": "6720852bc5377b410f2f279f5462fbd20cc7a9ad",
      "parents": [
        "c107387cef844aabad80ea1430bb768c2605e89f",
        "80c46255bcf3d4d5a3ffe9a1ef3aefd9310c6ed4"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:11:13 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:11:13 2012 -0700"
      },
      "message": "am 80c46255: am 874a074a: Merge \"avcenc: Switch malloc/free callbacks to use pointers instead of ints\"\n\n* commit \u002780c46255bcf3d4d5a3ffe9a1ef3aefd9310c6ed4\u0027:\n  avcenc: Switch malloc/free callbacks to use pointers instead of ints\n"
    },
    {
      "commit": "c107387cef844aabad80ea1430bb768c2605e89f",
      "tree": "ae5bd9610d447e33a9526499d8f765381b65376d",
      "parents": [
        "3478eaa23c19dbbe473be70e8f3cc0c904d2465c",
        "17fa4ab45a87e042a0503356e641fa6ff72ef572"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:11:12 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:11:12 2012 -0700"
      },
      "message": "am 17fa4ab4: am b7ee9c44: Merge \"mediacodec: Return an error on getOutputFormat if there is no output format yet\"\n\n* commit \u002717fa4ab45a87e042a0503356e641fa6ff72ef572\u0027:\n  mediacodec: Return an error on getOutputFormat if there is no output format yet\n"
    },
    {
      "commit": "ef62009372d050b431939835d4e2c5ee77da8831",
      "tree": "fce7ba1a7b5f5fa320b605117335f9343f18d45d",
      "parents": [
        "662b15c377e1ebe6aed8ff5cf82c684f0c8894dc",
        "efee009528f446542d51f1ce50e2189e8a2f71dd"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:08:17 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:08:17 2012 -0700"
      },
      "message": "am efee0095: Merge \"Correct ID3::StringSize calculation for UCS-2 data.\"\n\n* commit \u0027efee009528f446542d51f1ce50e2189e8a2f71dd\u0027:\n  Correct ID3::StringSize calculation for UCS-2 data.\n"
    },
    {
      "commit": "662b15c377e1ebe6aed8ff5cf82c684f0c8894dc",
      "tree": "94b0542d5a59ef169dad0b8bb13ad54d49210ed2",
      "parents": [
        "44237a8d58dc218257687f2cbe8fd33d73a713e8",
        "a858aa963d2a7e767d0d8694e29cb6fe87c9ef9f"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:08:16 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:08:16 2012 -0700"
      },
      "message": "am a858aa96: Merge \"avcenc: Remove redundant zero-initialization of allocated memory\"\n\n* commit \u0027a858aa963d2a7e767d0d8694e29cb6fe87c9ef9f\u0027:\n  avcenc: Remove redundant zero-initialization of allocated memory\n"
    },
    {
      "commit": "44237a8d58dc218257687f2cbe8fd33d73a713e8",
      "tree": "adb18ef017ae629be478eee1e3eff62aa51547e2",
      "parents": [
        "68d44b061e92fb6832240457d4f683635bf5328f",
        "b71298eeeb16d942dd5144e550731e6e29b6436e"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:08:15 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:08:15 2012 -0700"
      },
      "message": "am b71298ee: Merge \"avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function\"\n\n* commit \u0027b71298eeeb16d942dd5144e550731e6e29b6436e\u0027:\n  avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function\n"
    },
    {
      "commit": "68d44b061e92fb6832240457d4f683635bf5328f",
      "tree": "e4e70183ec1416704c27f689f644e789d5310c67",
      "parents": [
        "4348cbcec6c3aec02af722d633ebda24f94dfcc8",
        "0ab18f853571149de700930fbb783ecd6b2c5582"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:08:14 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:08:14 2012 -0700"
      },
      "message": "am 0ab18f85: Merge \"avcenc: Remove useless casts\"\n\n* commit \u00270ab18f853571149de700930fbb783ecd6b2c5582\u0027:\n  avcenc: Remove useless casts\n"
    },
    {
      "commit": "4348cbcec6c3aec02af722d633ebda24f94dfcc8",
      "tree": "f1e79565b29a16bf731ff447f92e91c2820e599d",
      "parents": [
        "96d18cca4546045df118660017e74ddd751dfbb4",
        "67f694d6b4234ea0d7ce2f8be8e6a9cc3b104eb9"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:08:13 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:08:13 2012 -0700"
      },
      "message": "am 67f694d6: Merge \"Initialize pool\\\u0027s buffer pointers to null.\"\n\n* commit \u002767f694d6b4234ea0d7ce2f8be8e6a9cc3b104eb9\u0027:\n  Initialize pool\u0027s buffer pointers to null.\n"
    },
    {
      "commit": "96d18cca4546045df118660017e74ddd751dfbb4",
      "tree": "ad115436899a0b098c565783af4ff684814ce4ab",
      "parents": [
        "80c46255bcf3d4d5a3ffe9a1ef3aefd9310c6ed4",
        "0822156cfd25c111cd33932ee9a89b3100d0350c"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:08:12 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:08:12 2012 -0700"
      },
      "message": "am 0822156c: Merge \"avcenc: Fix indentation\"\n\n* commit \u00270822156cfd25c111cd33932ee9a89b3100d0350c\u0027:\n  avcenc: Fix indentation\n"
    },
    {
      "commit": "80c46255bcf3d4d5a3ffe9a1ef3aefd9310c6ed4",
      "tree": "f4490c5f1ae330852d1eee5dba1eecaf1bedb524",
      "parents": [
        "17fa4ab45a87e042a0503356e641fa6ff72ef572",
        "874a074ad88117d9fabf178b5b4a1c885dc512f5"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:08:11 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:08:11 2012 -0700"
      },
      "message": "am 874a074a: Merge \"avcenc: Switch malloc/free callbacks to use pointers instead of ints\"\n\n* commit \u0027874a074ad88117d9fabf178b5b4a1c885dc512f5\u0027:\n  avcenc: Switch malloc/free callbacks to use pointers instead of ints\n"
    },
    {
      "commit": "17fa4ab45a87e042a0503356e641fa6ff72ef572",
      "tree": "6b0aba1c3489801c32ea4d819df727cd6902fae7",
      "parents": [
        "a9ab66c5fac826a765186146128158672bfac67c",
        "b7ee9c4436c50cc5ff6e72059bf27c2c16dc1b92"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 13:08:10 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 13:08:10 2012 -0700"
      },
      "message": "am b7ee9c44: Merge \"mediacodec: Return an error on getOutputFormat if there is no output format yet\"\n\n* commit \u0027b7ee9c4436c50cc5ff6e72059bf27c2c16dc1b92\u0027:\n  mediacodec: Return an error on getOutputFormat if there is no output format yet\n"
    },
    {
      "commit": "efee009528f446542d51f1ce50e2189e8a2f71dd",
      "tree": "0c502480e6e493fe06e741ba10620d871af09b07",
      "parents": [
        "a858aa963d2a7e767d0d8694e29cb6fe87c9ef9f",
        "be5016bac5c1b422d850e299d3cb11fecf0ac19d"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 12:58:42 2012 -0700"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Aug 08 12:58:42 2012 -0700"
      },
      "message": "Merge \"Correct ID3::StringSize calculation for UCS-2 data.\""
    },
    {
      "commit": "a858aa963d2a7e767d0d8694e29cb6fe87c9ef9f",
      "tree": "19d521b2ac7b1d8d1f4ff7f58ea284a1cde4b8fe",
      "parents": [
        "b71298eeeb16d942dd5144e550731e6e29b6436e",
        "21dc4b6a99f0427cc1c0b10d3dcdb34c7571d10f"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 12:09:01 2012 -0700"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Aug 08 12:09:01 2012 -0700"
      },
      "message": "Merge \"avcenc: Remove redundant zero-initialization of allocated memory\""
    },
    {
      "commit": "b71298eeeb16d942dd5144e550731e6e29b6436e",
      "tree": "d139330ca50b2ed5a2404560877f6e22319959db",
      "parents": [
        "0ab18f853571149de700930fbb783ecd6b2c5582",
        "359d8fcd30ff0a8390e4c5560d53ec55a4cc5bcd"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 12:08:44 2012 -0700"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Aug 08 12:08:45 2012 -0700"
      },
      "message": "Merge \"avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function\""
    },
    {
      "commit": "0ab18f853571149de700930fbb783ecd6b2c5582",
      "tree": "4bb0c358c68813141eaf1daf6339eb48c85794f8",
      "parents": [
        "67f694d6b4234ea0d7ce2f8be8e6a9cc3b104eb9",
        "2f3152dee8e763fd7eae9d7b71078d5c6aec5881"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 12:08:19 2012 -0700"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Aug 08 12:08:19 2012 -0700"
      },
      "message": "Merge \"avcenc: Remove useless casts\""
    },
    {
      "commit": "67f694d6b4234ea0d7ce2f8be8e6a9cc3b104eb9",
      "tree": "6f36b732e497377f8e1ce8cebff9aba898440b44",
      "parents": [
        "0822156cfd25c111cd33932ee9a89b3100d0350c",
        "9d8e55cd2705a6ab43ea4aca6f94feb7bef87938"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 12:08:04 2012 -0700"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Aug 08 12:08:05 2012 -0700"
      },
      "message": "Merge \"Initialize pool\u0027s buffer pointers to null.\""
    },
    {
      "commit": "0822156cfd25c111cd33932ee9a89b3100d0350c",
      "tree": "d85aa84ada30e17fc2c71601a9ffa78bf12b2c18",
      "parents": [
        "874a074ad88117d9fabf178b5b4a1c885dc512f5",
        "955585cca11173b07e2e7db3d636ee97b69b053b"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 12:07:47 2012 -0700"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Aug 08 12:07:48 2012 -0700"
      },
      "message": "Merge \"avcenc: Fix indentation\""
    },
    {
      "commit": "874a074ad88117d9fabf178b5b4a1c885dc512f5",
      "tree": "4bf614aa2a00475b2d2a8fc1364f83c94e27829c",
      "parents": [
        "b7ee9c4436c50cc5ff6e72059bf27c2c16dc1b92",
        "23da4cf305b9bfff07954711a8a2d9ec040865af"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 12:07:27 2012 -0700"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Aug 08 12:07:28 2012 -0700"
      },
      "message": "Merge \"avcenc: Switch malloc/free callbacks to use pointers instead of ints\""
    },
    {
      "commit": "b7ee9c4436c50cc5ff6e72059bf27c2c16dc1b92",
      "tree": "e46ebf713b523c4f4a69c04291a10d755b09b98d",
      "parents": [
        "ffd99cb795c92caee7f4bd0b26af9ae37b100fc3",
        "5c63a648f943b0ec91c3262ced77d1598ff32093"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Aug 08 12:06:48 2012 -0700"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Aug 08 12:06:49 2012 -0700"
      },
      "message": "Merge \"mediacodec: Return an error on getOutputFormat if there is no output format yet\""
    },
    {
      "commit": "b58d58353bfedb98238f58892f9cac252a5d0c45",
      "tree": "75aaf19b9286eed494ad90d68503049adcc94549",
      "parents": [
        "7c8e199ebbc4ff1642c20ac2682851567ad8462a",
        "5ed3e21fdc33dee41ab9a5cb61a02e6a048168a8"
      ],
      "author": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Wed Aug 08 11:30:56 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 11:30:56 2012 -0700"
      },
      "message": "am 5ed3e21f: am 3478eaa2: Fix a small build warning.\n\n* commit \u00275ed3e21fdc33dee41ab9a5cb61a02e6a048168a8\u0027:\n  Fix a small build warning.\n"
    },
    {
      "commit": "5ed3e21fdc33dee41ab9a5cb61a02e6a048168a8",
      "tree": "ae5bd9610d447e33a9526499d8f765381b65376d",
      "parents": [
        "c3042db6d36f3f7cfe7267ae10935bbe1460f342",
        "3478eaa23c19dbbe473be70e8f3cc0c904d2465c"
      ],
      "author": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Wed Aug 08 11:29:28 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 11:29:28 2012 -0700"
      },
      "message": "am 3478eaa2: Fix a small build warning.\n\n* commit \u00273478eaa23c19dbbe473be70e8f3cc0c904d2465c\u0027:\n  Fix a small build warning.\n"
    },
    {
      "commit": "2c3b2da3049627264b7c6b449a1622f002210f03",
      "tree": "f99fadbfef22ff3b7709a505623371c22e39566c",
      "parents": [
        "ee578c0330319f04a48bccbdb26b53fea0388d04"
      ],
      "author": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Thu Aug 02 17:08:54 2012 -0700"
      },
      "committer": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Wed Aug 08 11:28:15 2012 -0700"
      },
      "message": "AudioFlinger: fix timed audio\n\n(cherry picked from commit e20ac92c564a2f4e8123885807abdf0a78de0dd7)\n\n\u003e AudioFlinger: fix timed audio\n\u003e\n\u003e Addresses Bug 6900517.\n\u003e\n\u003e Finish up support for timed audio in the new FastMixer world.  Pay special\n\u003e attention to remaining lock-less and voluntary yield free on the FastMixer\n\u003e thread.  This fixes audio playback for Q on JB.\n\u003e\n\u003e Change-Id: Iaf815e58a1b1d0a0190051794bec8dc5c9231785\n\u003e Signed-off-by: John Grossman \u003cjohngro@google.com\u003e\n\nChange-Id: I9bd687acc345a05867af48e71116690fdb0ce1b5\nSigned-off-by: John Grossman \u003cjohngro@google.com\u003e\n"
    },
    {
      "commit": "ee578c0330319f04a48bccbdb26b53fea0388d04",
      "tree": "883382e0eabdcdff6c04a7df4b50d9cebffaf1c7",
      "parents": [
        "d8f178d613821c3f61a5c5e391eb275339e526a9"
      ],
      "author": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Mon Jul 23 17:05:46 2012 -0700"
      },
      "committer": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Wed Aug 08 11:28:15 2012 -0700"
      },
      "message": "AudioFlinger: Better handling for master volume/mute\n\n(cherry picked from commit 93d906837e0e89aa1d9c913ab2b531b809f9bb9e)\n\n\u003e AudioFlinger: Better handling for master volume/mute\n\u003e\n\u003e Changes to address bug 6842827.\n\u003e\n\u003e When a HAL is loaded, cache whether or not the HAL supports\n\u003e set_master_volume/mute in the AudioHwDevice structure.  Store an\n\u003e AudioHwDevice in AudioStream(In|Out) structures instead of just an\n\u003e audio_he_device_t.  This give threads (PlaybackThreads in\n\u003e particular) access to the cached capabilities.\n\u003e\n\u003e When setting master volume/mute, change the system to always set the\n\u003e setting on all HAL which support it and also to set the setting on all\n\u003e PlaybackThreads.  Change PlaybackThreads to apply the setting at the\n\u003e in SW mix stage of the pipeline if its assigned HAL does not support\n\u003e the setting, or to ignore the setting of the assigned HAL does support\n\u003e it.\n\u003e\n\u003e Change-Id: Ia14137a30b4c3ee6f2d7ddcc8cba87bf5eec87f4\n\u003e Signed-off-by: John Grossman \u003cjohngro@google.com\u003e\n\nChange-Id: Icb6bc13764e100a2003eb1dee2231132ab287d98\nSigned-off-by: John Grossman \u003cjohngro@google.com\u003e\n"
    },
    {
      "commit": "d8f178d613821c3f61a5c5e391eb275339e526a9",
      "tree": "93038d06c70535eeebc364e9f86cedbec074802c",
      "parents": [
        "3478eaa23c19dbbe473be70e8f3cc0c904d2465c"
      ],
      "author": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Fri Jul 20 14:51:35 2012 -0700"
      },
      "committer": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Wed Aug 08 11:28:15 2012 -0700"
      },
      "message": "Change audio flinger to user HAL master mute if available\n\n(cherry picked from commit 91de9b56282d126ffb36344266af5fee3cefcfdd)\n\n\u003e Change audio flinger to user HAL master mute if available\n\u003e\n\u003e Hand merge from ics-aah\n\u003e\n\u003e \u003e Change audio flinger to user HAL master mute if available: DO NOT MERGE\n\u003e \u003e\n\u003e \u003e Replicate the pattern used for HAL master volume support to make use\n\u003e \u003e of master mute support if the HAL supports it.  This is part of the\n\u003e \u003e change needed to address bug 6828363.  Because of the divergences\n\u003e \u003e between ICS and master, this change will need to be merged by hand.\n\u003e \u003e\n\u003e \u003e Signed-off-by: John Grossman \u003cjohngro@google.com\u003e\n\u003e \u003e Change-Id: I6d83be524021d273d093bcb117b8f2fe57c23685\n\u003e\n\u003e Change-Id: I32280582905c969aaec2bb166ec5c61df82d737a\n\u003e Signed-off-by: John Grossman \u003cjohngro@google.com\u003e\n\nChange-Id: I5cd709187221d307fe25c5117ccaadca5f6b197b\nSigned-off-by: John Grossman \u003cjohngro@google.com\u003e\n"
    },
    {
      "commit": "3478eaa23c19dbbe473be70e8f3cc0c904d2465c",
      "tree": "ae5bd9610d447e33a9526499d8f765381b65376d",
      "parents": [
        "6fb082ae298a0c6028d540c099ae5a1838701bdd"
      ],
      "author": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Wed Aug 08 11:18:56 2012 -0700"
      },
      "committer": {
        "name": "John Grossman",
        "email": "johngro@google.com",
        "time": "Wed Aug 08 11:20:05 2012 -0700"
      },
      "message": "Fix a small build warning.\n\nChange-Id: I2b228db8f11a829399cdc6efe67d7b6e0a1917ba\n"
    },
    {
      "commit": "7c8e199ebbc4ff1642c20ac2682851567ad8462a",
      "tree": "0b0c14dd5daf23898df3d2e891e13fd36aa4dca3",
      "parents": [
        "1c84cb0bd8bc404afd35618a1c34200abce6aa8e",
        "c3042db6d36f3f7cfe7267ae10935bbe1460f342"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Aug 08 11:09:06 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 11:09:06 2012 -0700"
      },
      "message": "am c3042db6: am 6fb082ae: Merge \"Make sure that the trackId starts from 1\" into jb-mr1-dev\n\n* commit \u0027c3042db6d36f3f7cfe7267ae10935bbe1460f342\u0027:\n  Make sure that the trackId starts from 1\n"
    },
    {
      "commit": "c3042db6d36f3f7cfe7267ae10935bbe1460f342",
      "tree": "adc9d0004f299a5e0ea640f135fe30e38463e0fb",
      "parents": [
        "ef8532b0ae4a34f02f824ba0c0f3e8d4db2067e1",
        "6fb082ae298a0c6028d540c099ae5a1838701bdd"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Aug 08 11:07:34 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 11:07:34 2012 -0700"
      },
      "message": "am 6fb082ae: Merge \"Make sure that the trackId starts from 1\" into jb-mr1-dev\n\n* commit \u00276fb082ae298a0c6028d540c099ae5a1838701bdd\u0027:\n  Make sure that the trackId starts from 1\n"
    },
    {
      "commit": "6fb082ae298a0c6028d540c099ae5a1838701bdd",
      "tree": "adc9d0004f299a5e0ea640f135fe30e38463e0fb",
      "parents": [
        "e2229fba1c7e98c243ea777f567fd72579d91e41",
        "219f195159f93d627af2b243732e3f9020511a46"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Aug 08 11:05:15 2012 -0700"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Aug 08 11:05:16 2012 -0700"
      },
      "message": "Merge \"Make sure that the trackId starts from 1\" into jb-mr1-dev"
    },
    {
      "commit": "1c84cb0bd8bc404afd35618a1c34200abce6aa8e",
      "tree": "3750e6e3235f6f6218e6780a50a8e46416602c46",
      "parents": [
        "04c0891039fcb581461510c7a608793a035abbfb",
        "ef8532b0ae4a34f02f824ba0c0f3e8d4db2067e1"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Wed Aug 08 09:46:19 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 09:46:19 2012 -0700"
      },
      "message": "am ef8532b0: am e2229fba: Merge \"Handle empty stsc box\" into jb-mr1-dev\n\n* commit \u0027ef8532b0ae4a34f02f824ba0c0f3e8d4db2067e1\u0027:\n  Handle empty stsc box\n"
    },
    {
      "commit": "ef8532b0ae4a34f02f824ba0c0f3e8d4db2067e1",
      "tree": "c9896144a6719480f828d568319c81f0bba9a2ca",
      "parents": [
        "876b7b50b4474c03105012f896e4227f0cacf024",
        "e2229fba1c7e98c243ea777f567fd72579d91e41"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Wed Aug 08 09:45:30 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 09:45:30 2012 -0700"
      },
      "message": "am e2229fba: Merge \"Handle empty stsc box\" into jb-mr1-dev\n\n* commit \u0027e2229fba1c7e98c243ea777f567fd72579d91e41\u0027:\n  Handle empty stsc box\n"
    },
    {
      "commit": "e2229fba1c7e98c243ea777f567fd72579d91e41",
      "tree": "c9896144a6719480f828d568319c81f0bba9a2ca",
      "parents": [
        "a9e0ea58738a50de84a80d3b4db1936e7433dce4",
        "b7e75cfd64893dde230dfc1c3b281a00ca1b4470"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Wed Aug 08 09:43:26 2012 -0700"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Aug 08 09:43:26 2012 -0700"
      },
      "message": "Merge \"Handle empty stsc box\" into jb-mr1-dev"
    },
    {
      "commit": "b7e75cfd64893dde230dfc1c3b281a00ca1b4470",
      "tree": "1ed2135b58a8762cdefda74197ea688a50b907b5",
      "parents": [
        "28620ee3e9926ef07f0b4cb3e22b156b812e2d7e"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Wed Aug 08 09:19:05 2012 -0700"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Wed Aug 08 09:19:05 2012 -0700"
      },
      "message": "Handle empty stsc box\n\nChange-Id: I867e2499fac3045075654aaaecf44327753327fd\n"
    },
    {
      "commit": "04c0891039fcb581461510c7a608793a035abbfb",
      "tree": "a4dc46a7c6d7acff9c31237b595b58a04b77e834",
      "parents": [
        "90041f7f24bfb9e1dc5e57ca51d39d83487fcb2a",
        "876b7b50b4474c03105012f896e4227f0cacf024"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Aug 08 08:18:51 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Aug 08 08:18:51 2012 -0700"
      },
      "message": "am 876b7b50: (-s ours) Reconcile with jb-mr1-release - do not merge\n\n* commit \u0027876b7b50b4474c03105012f896e4227f0cacf024\u0027:\n"
    },
    {
      "commit": "876b7b50b4474c03105012f896e4227f0cacf024",
      "tree": "d107c25c3bc97a6cb1f25fb00aeb10a2882d5f26",
      "parents": [
        "7047e4aff7402cbc1738f041f9777550e1bd087c",
        "ba668e07d2ab01a95a9ef941e17483199d53ffe8"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Aug 08 08:16:39 2012 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Aug 08 08:16:40 2012 -0700"
      },
      "message": "Reconcile with jb-mr1-release - do not merge\n\nChange-Id: I3bafd77a8fe73cc617dda88332b1a403f4803402\n"
    },
    {
      "commit": "ba668e07d2ab01a95a9ef941e17483199d53ffe8",
      "tree": "d107c25c3bc97a6cb1f25fb00aeb10a2882d5f26",
      "parents": [
        "a9e0ea58738a50de84a80d3b4db1936e7433dce4",
        "f5043b0c0759993967c4f075a658ffe9b79cd49a"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Wed Aug 08 06:47:07 2012 -0700"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Wed Aug 08 06:47:07 2012 -0700"
      },
      "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n"
    },
    {
      "commit": "219f195159f93d627af2b243732e3f9020511a46",
      "tree": "3f8c072142c982726d9e56c4858c5493c8d128ba",
      "parents": [
        "a9e0ea58738a50de84a80d3b4db1936e7433dce4"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Tue Aug 07 16:54:22 2012 -0700"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Tue Aug 07 16:57:49 2012 -0700"
      },
      "message": "Make sure that the trackId starts from 1\n\no this patch avoids sending incorrect track events to applications because\n  track events contain the trackId\n\nChange-Id: I1cf054da8ab413d31a5b7fe8ed729486d1475c46\n"
    },
    {
      "commit": "90041f7f24bfb9e1dc5e57ca51d39d83487fcb2a",
      "tree": "a4dc46a7c6d7acff9c31237b595b58a04b77e834",
      "parents": [
        "3c93934640cdf03881933e2a4fa53236124dec7c",
        "7047e4aff7402cbc1738f041f9777550e1bd087c"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Aug 07 15:23:08 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Aug 07 15:23:08 2012 -0700"
      },
      "message": "am 7047e4af: am a9e0ea58: Merge \"Remove the no longer used PV software aac decoder.\" into jb-mr1-dev\n\n* commit \u00277047e4aff7402cbc1738f041f9777550e1bd087c\u0027:\n  Remove the no longer used PV software aac decoder.\n"
    },
    {
      "commit": "3c93934640cdf03881933e2a4fa53236124dec7c",
      "tree": "88f776c2c5ce1305031600b45136c2b377e979c7",
      "parents": [
        "659667c27cfe12e071b0754f39bdaf3e3f415156",
        "b01b83c8755738f8e9d4beae32165fae458972a4"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Aug 07 15:22:38 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Aug 07 15:22:38 2012 -0700"
      },
      "message": "am b01b83c8: am 51d75479: Only emit padding at the end of the stream in the aac and mp3 decoders\n\n* commit \u0027b01b83c8755738f8e9d4beae32165fae458972a4\u0027:\n  Only emit padding at the end of the stream in the aac and mp3 decoders\n"
    },
    {
      "commit": "7047e4aff7402cbc1738f041f9777550e1bd087c",
      "tree": "d107c25c3bc97a6cb1f25fb00aeb10a2882d5f26",
      "parents": [
        "b01b83c8755738f8e9d4beae32165fae458972a4",
        "a9e0ea58738a50de84a80d3b4db1936e7433dce4"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Aug 07 15:18:53 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Aug 07 15:18:53 2012 -0700"
      },
      "message": "am a9e0ea58: Merge \"Remove the no longer used PV software aac decoder.\" into jb-mr1-dev\n\n* commit \u0027a9e0ea58738a50de84a80d3b4db1936e7433dce4\u0027:\n  Remove the no longer used PV software aac decoder.\n"
    },
    {
      "commit": "a9e0ea58738a50de84a80d3b4db1936e7433dce4",
      "tree": "d107c25c3bc97a6cb1f25fb00aeb10a2882d5f26",
      "parents": [
        "51d7547944967d1157b7fe18e1fb8f7ee6810412",
        "1f8834711f23f66d528aca98cca9602fb18cab66"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Aug 07 15:17:19 2012 -0700"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Aug 07 15:17:19 2012 -0700"
      },
      "message": "Merge \"Remove the no longer used PV software aac decoder.\" into jb-mr1-dev"
    },
    {
      "commit": "b01b83c8755738f8e9d4beae32165fae458972a4",
      "tree": "5c5d6cb884a163c7ea1f23899776f856fefbd1fa",
      "parents": [
        "50f4109edda29b791a2fb7ed39be315c31610f3f",
        "51d7547944967d1157b7fe18e1fb8f7ee6810412"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Aug 07 14:49:39 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Aug 07 14:49:39 2012 -0700"
      },
      "message": "am 51d75479: Only emit padding at the end of the stream in the aac and mp3 decoders\n\n* commit \u002751d7547944967d1157b7fe18e1fb8f7ee6810412\u0027:\n  Only emit padding at the end of the stream in the aac and mp3 decoders\n"
    },
    {
      "commit": "1f8834711f23f66d528aca98cca9602fb18cab66",
      "tree": "63625d311b37da5455e58e76fa8ab62612f924ee",
      "parents": [
        "e671207115fac3914134c61b336d5fa0242c68ca"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Aug 07 14:41:05 2012 -0700"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Aug 07 14:41:05 2012 -0700"
      },
      "message": "Remove the no longer used PV software aac decoder.\n\nChange-Id: Ia260f706780b66dc16a108aaa8780f68970380bd\n"
    },
    {
      "commit": "51d7547944967d1157b7fe18e1fb8f7ee6810412",
      "tree": "5c5d6cb884a163c7ea1f23899776f856fefbd1fa",
      "parents": [
        "e671207115fac3914134c61b336d5fa0242c68ca"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Aug 07 14:24:00 2012 -0700"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Aug 07 14:24:00 2012 -0700"
      },
      "message": "Only emit padding at the end of the stream in the aac and mp3 decoders\n\nif we actually discarded content at the beginning of the stream.\n\nChange-Id: I1e79835bb3a02350060a137b94f85f2c90f4a12b\n"
    },
    {
      "commit": "659667c27cfe12e071b0754f39bdaf3e3f415156",
      "tree": "70a23931c891fe91143a5fc9302bf051d7dfe66f",
      "parents": [
        "1498d1924d0075bd54410ea2c295b1aa92ed7ad6",
        "50f4109edda29b791a2fb7ed39be315c31610f3f"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Aug 07 13:26:13 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Aug 07 13:26:13 2012 -0700"
      },
      "message": "am 50f4109e: am e6712071: Make sure codec names and corresponding quirks are returned together.\n\n* commit \u002750f4109edda29b791a2fb7ed39be315c31610f3f\u0027:\n  Make sure codec names and corresponding quirks are returned together.\n"
    },
    {
      "commit": "50f4109edda29b791a2fb7ed39be315c31610f3f",
      "tree": "466cda101e1528b81bf72c228d7060c33788dedf",
      "parents": [
        "119254b2707cbaf11fd1eaffdeaebb3e022ad8d0",
        "e671207115fac3914134c61b336d5fa0242c68ca"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Aug 07 13:24:11 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Aug 07 13:24:11 2012 -0700"
      },
      "message": "am e6712071: Make sure codec names and corresponding quirks are returned together.\n\n* commit \u0027e671207115fac3914134c61b336d5fa0242c68ca\u0027:\n  Make sure codec names and corresponding quirks are returned together.\n"
    },
    {
      "commit": "e671207115fac3914134c61b336d5fa0242c68ca",
      "tree": "466cda101e1528b81bf72c228d7060c33788dedf",
      "parents": [
        "28620ee3e9926ef07f0b4cb3e22b156b812e2d7e"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jun 26 10:56:14 2012 -0700"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Aug 07 13:08:15 2012 -0700"
      },
      "message": "Make sure codec names and corresponding quirks are returned together.\n\nPreviously they were returned in separate vectors and only one of them was sorted if\nsoftware codecs were preferred, leaving the quirks no longer matching the codec name\nat the same index.\n\nChange-Id: Id3f1e6f9f7f8c9cc4b6ebfb86a203b4d59de8604\nrelated-to-bug: 6737884\n"
    },
    {
      "commit": "1498d1924d0075bd54410ea2c295b1aa92ed7ad6",
      "tree": "13e84caf3ebace6e336fb479dcfbc6dbacffa743",
      "parents": [
        "1f359b58135c9078011a44ede05baef362e1feac",
        "119254b2707cbaf11fd1eaffdeaebb3e022ad8d0"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Aug 07 11:43:48 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Aug 07 11:43:48 2012 -0700"
      },
      "message": "am 119254b2: am 28620ee3: Merge \"mediacodec: Return an error on getOutputFormat if there is no output format yet\" into jb-mr1-dev\n\n* commit \u0027119254b2707cbaf11fd1eaffdeaebb3e022ad8d0\u0027:\n  mediacodec: Return an error on getOutputFormat if there is no output format yet\n"
    },
    {
      "commit": "119254b2707cbaf11fd1eaffdeaebb3e022ad8d0",
      "tree": "9b86960e4b0b76e5d11987de8d51e4ec9fc103a0",
      "parents": [
        "0624f9120951494881236195237b94a96838db6f",
        "28620ee3e9926ef07f0b4cb3e22b156b812e2d7e"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Aug 07 11:42:07 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Aug 07 11:42:07 2012 -0700"
      },
      "message": "am 28620ee3: Merge \"mediacodec: Return an error on getOutputFormat if there is no output format yet\" into jb-mr1-dev\n\n* commit \u002728620ee3e9926ef07f0b4cb3e22b156b812e2d7e\u0027:\n  mediacodec: Return an error on getOutputFormat if there is no output format yet\n"
    },
    {
      "commit": "28620ee3e9926ef07f0b4cb3e22b156b812e2d7e",
      "tree": "9b86960e4b0b76e5d11987de8d51e4ec9fc103a0",
      "parents": [
        "42c5ef98bd09e7d93610d4ca1f4959b63bc3267d",
        "972f2321583ef4094477271e0fc6a1d05a1a0eea"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Aug 07 11:40:04 2012 -0700"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Aug 07 11:40:05 2012 -0700"
      },
      "message": "Merge \"mediacodec: Return an error on getOutputFormat if there is no output format yet\" into jb-mr1-dev"
    },
    {
      "commit": "972f2321583ef4094477271e0fc6a1d05a1a0eea",
      "tree": "ae5c8ddade5a100486d8a989c7c4d755b7908d60",
      "parents": [
        "97197157cf619fb716710eb67915fdfa93502750"
      ],
      "author": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Fri Jul 13 12:48:19 2012 +0300"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Aug 07 11:08:12 2012 -0700"
      },
      "message": "mediacodec: Return an error on getOutputFormat if there is no output format yet\n\nThis avoids crashing if calling the public java method\nMediaCodec.getOutputFormat immediately after MediaCodec.start\n(as the documentation example shows that one should do!).\n\nChange-Id: Icd3dd7ab9ae9e8f2a67cef171ff176735de95f58\n"
    },
    {
      "commit": "1f359b58135c9078011a44ede05baef362e1feac",
      "tree": "6d2f2ddd8169f8477154a1bc4a85dd0eeb10486b",
      "parents": [
        "e90b7d5b28bb4c192be215f64269d23c9ed6c102",
        "0624f9120951494881236195237b94a96838db6f"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Aug 07 11:05:49 2012 -0700"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Aug 07 11:05:49 2012 -0700"
      },
      "message": "am 0624f912: (-s ours) Reconcile with jb-mr1-release - do not merge\n\n* commit \u00270624f9120951494881236195237b94a96838db6f\u0027:\n"
    },
    {
      "commit": "0624f9120951494881236195237b94a96838db6f",
      "tree": "ea68ebae1f07a2257daa1e45f2d7503e9bf0effa",
      "parents": [
        "1b782a946da7612686a5090f58cb5daae0eb4b79",
        "f5043b0c0759993967c4f075a658ffe9b79cd49a"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Aug 07 11:03:26 2012 -0700"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Aug 07 11:03:26 2012 -0700"
      },
      "message": "Reconcile with jb-mr1-release - do not merge\n\nChange-Id: I8ad298c8a095bcd2eed529e719b98782fc506dda\n"
    }
  ],
  "next": "e90b7d5b28bb4c192be215f64269d23c9ed6c102"
}
