)]}'
{
  "log": [
    {
      "commit": "c5121002e5988ba1be660f3fbdb2067776b079fe",
      "tree": "72ba29a15f2425c09402c3de5ee0970745714023",
      "parents": [
        "c191482ed3dd99db08f8c3864aa1c24bf1229e5c",
        "c256004a8cbf4dc1d647957243cf8be1a3c7bec4"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Sat Sep 12 08:49:17 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Sat Sep 12 08:49:17 2015 +0000"
      },
      "message": "am c256004a: am 69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error.\n\n* commit \u0027c256004a8cbf4dc1d647957243cf8be1a3c7bec4\u0027:\n  libstagefright: fix A_Refl to return immediately when there is an error.\n"
    },
    {
      "commit": "c191482ed3dd99db08f8c3864aa1c24bf1229e5c",
      "tree": "bdaea984bbd7c3def97f7bfc6719562a3ca94f9e",
      "parents": [
        "b5611b843918a27ff8cac096ea044f486194e673",
        "1c7719820359f4190cd4bfd1a24d521face7b4f8"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Sep 11 13:55:30 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Sep 11 13:55:30 2015 +0000"
      },
      "message": "Merge \"DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.\" into lmp-dev"
    },
    {
      "commit": "b5611b843918a27ff8cac096ea044f486194e673",
      "tree": "b0d65bc29abd7c55df8e8a38135fec58b894686a",
      "parents": [
        "322e2dc56b48a8a06ce90e6a42dbf4491e3efec0",
        "28314aef9e8a666dbb75bbd555f6566a6c991f1c"
      ],
      "author": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Fri Sep 11 06:59:11 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Sep 11 06:59:11 2015 +0000"
      },
      "message": "Merge \"Revert \"Avoid size_t overflow in base64 decoding once again\"\" into lmp-dev"
    },
    {
      "commit": "28314aef9e8a666dbb75bbd555f6566a6c991f1c",
      "tree": "472d338d65970f75ed5df6cddc4664e9e2a42d34",
      "parents": [
        "c9ac5dfdafed1c66beae090cafa97002764e0ca3"
      ],
      "author": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Fri Sep 11 06:51:10 2015 +0000"
      },
      "committer": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Fri Sep 11 06:51:10 2015 +0000"
      },
      "message": "Revert \"Avoid size_t overflow in base64 decoding once again\"\n\nThis reverts commit c9ac5dfdafed1c66beae090cafa97002764e0ca3.\n\nChange-Id: Iae9707bbd8641a0bb00fcda39a20eb8b8f4f5232\n"
    },
    {
      "commit": "322e2dc56b48a8a06ce90e6a42dbf4491e3efec0",
      "tree": "3d2b1a489441404739d7d192da01ed247dd18ace",
      "parents": [
        "f3eb82683a80341f5ac23057aab733a57963cab2",
        "c9ac5dfdafed1c66beae090cafa97002764e0ca3"
      ],
      "author": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Fri Sep 11 06:49:37 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Sep 11 06:49:37 2015 +0000"
      },
      "message": "Merge \"Avoid size_t overflow in base64 decoding once again\" into lmp-dev"
    },
    {
      "commit": "c256004a8cbf4dc1d647957243cf8be1a3c7bec4",
      "tree": "bd7e3744dab54923ade5be5a4038c1832acd7056",
      "parents": [
        "c1e989e76a461ea69e293839b3c29b634a462bd5",
        "69ae6a87342d5260d8d8660accc8aa1b9367dbbe"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Sep 10 21:23:55 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Sep 10 21:23:55 2015 +0000"
      },
      "message": "am 69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error.\n\n* commit \u002769ae6a87342d5260d8d8660accc8aa1b9367dbbe\u0027:\n  libstagefright: fix A_Refl to return immediately when there is an error.\n"
    },
    {
      "commit": "1c7719820359f4190cd4bfd1a24d521face7b4f8",
      "tree": "bdaea984bbd7c3def97f7bfc6719562a3ca94f9e",
      "parents": [
        "f3eb82683a80341f5ac23057aab733a57963cab2"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed Sep 09 09:48:34 2015 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Sep 10 10:06:19 2015 -0700"
      },
      "message": "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.\n\nBug: 23905951\nBug: 23912202\nChange-Id: Id13a9d3cae2c09e7381b841e67ddfb188274d74c\n(cherry picked from commit e995e477ad59b79145200c8f1e9e13c16c682d59)\n"
    },
    {
      "commit": "c9ac5dfdafed1c66beae090cafa97002764e0ca3",
      "tree": "c34b508863d34e9b38780663dec1061f032599fa",
      "parents": [
        "2b63b91b84c75afdef4213aa11b0dcc8e7d735a3"
      ],
      "author": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Mon Sep 07 15:52:27 2015 +0900"
      },
      "committer": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Wed Sep 09 04:59:39 2015 +0000"
      },
      "message": "Avoid size_t overflow in base64 decoding once again\n\nSwitch to foundation base64 function in OggExtractor and fix the\nissue there.\n\nBug: 23707088\nChange-Id: I999ae911177c88dc13f9ee9796ca93c5928b20b0\n"
    },
    {
      "commit": "f3eb82683a80341f5ac23057aab733a57963cab2",
      "tree": "b0d65bc29abd7c55df8e8a38135fec58b894686a",
      "parents": [
        "2b63b91b84c75afdef4213aa11b0dcc8e7d735a3"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Wed Sep 02 14:02:47 2015 -0700"
      },
      "committer": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Tue Sep 08 12:00:17 2015 -0700"
      },
      "message": "DO NOT MERGE: Protect data source access with mutex during disconnect\n\nBug: 23658148\nChange-Id: Ic37cac7b5d166143e0b77e9919b0aaef486e4fdd\n"
    },
    {
      "commit": "69ae6a87342d5260d8d8660accc8aa1b9367dbbe",
      "tree": "42275af16d02cd3dbba6c7f3cfffa054a25da1ac",
      "parents": [
        "13ff64c2db84f4e7cac3396700e333b48c42c7ee"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Sep 04 09:13:37 2015 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Sep 08 09:06:04 2015 -0700"
      },
      "message": "libstagefright: fix A_Refl to return immediately when there is an error.\n\nBug: 23609206\nChange-Id: I2ad25fb208df17f5a5b6d6b356eff2f400627f22\n(cherry picked from commit 715dcb9c90d86c1a02a0da056f3cee8875ad1230)\n"
    },
    {
      "commit": "2b63b91b84c75afdef4213aa11b0dcc8e7d735a3",
      "tree": "472d338d65970f75ed5df6cddc4664e9e2a42d34",
      "parents": [
        "52a4fc09b483a20ee7d5970be01598ee262f7088",
        "c1e989e76a461ea69e293839b3c29b634a462bd5"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Thu Sep 03 18:05:44 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Sep 03 18:05:44 2015 +0000"
      },
      "message": "am c1e989e7: am 13ff64c2: Merge \"Zero out return values in media binder calls\" into klp-dev\n\n* commit \u0027c1e989e76a461ea69e293839b3c29b634a462bd5\u0027:\n  Zero out return values in media binder calls\n"
    },
    {
      "commit": "52a4fc09b483a20ee7d5970be01598ee262f7088",
      "tree": "6df9c8ad33bffec0266be615e0162b15fcbe5e49",
      "parents": [
        "7d34959b10e0e8a9ac4cdd5e10a6d016513aa03f",
        "3732a3acafa7eb621bc26cca3eb00150ea12d2e2"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Thu Sep 03 18:05:43 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Sep 03 18:05:43 2015 +0000"
      },
      "message": "am 3732a3ac: am ab203130: Merge \"Make IEffect command more robust (second try)\" into klp-dev\n\n* commit \u00273732a3acafa7eb621bc26cca3eb00150ea12d2e2\u0027:\n  Make IEffect command more robust (second try)\n"
    },
    {
      "commit": "7d34959b10e0e8a9ac4cdd5e10a6d016513aa03f",
      "tree": "19c0b050a3e7a79d192ec6520ab977d9046a90ee",
      "parents": [
        "75143f30b31a7b38362281d0bbf6109b0e423441",
        "16e12007ab1581e1b6aa973f3c83b2a45a816881"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Sep 03 18:05:42 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Sep 03 18:05:42 2015 +0000"
      },
      "message": "am 16e12007: am 74888428: Merge \"Fix timedtext parsing\" into klp-dev\n\n* commit \u002716e12007ab1581e1b6aa973f3c83b2a45a816881\u0027:\n  Fix timedtext parsing\n"
    },
    {
      "commit": "c1e989e76a461ea69e293839b3c29b634a462bd5",
      "tree": "f2285a73a3ae481533a578215ae6c6cef2c63fe1",
      "parents": [
        "3732a3acafa7eb621bc26cca3eb00150ea12d2e2",
        "13ff64c2db84f4e7cac3396700e333b48c42c7ee"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Thu Sep 03 17:52:44 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Sep 03 17:52:44 2015 +0000"
      },
      "message": "am 13ff64c2: Merge \"Zero out return values in media binder calls\" into klp-dev\n\n* commit \u002713ff64c2db84f4e7cac3396700e333b48c42c7ee\u0027:\n  Zero out return values in media binder calls\n"
    },
    {
      "commit": "3732a3acafa7eb621bc26cca3eb00150ea12d2e2",
      "tree": "867b54747e20ee05ebb5b59d655e952ac2b47247",
      "parents": [
        "16e12007ab1581e1b6aa973f3c83b2a45a816881",
        "ab20313074bb109f29f677c3f09d5da1a48c94e7"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Thu Sep 03 17:52:43 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Sep 03 17:52:43 2015 +0000"
      },
      "message": "am ab203130: Merge \"Make IEffect command more robust (second try)\" into klp-dev\n\n* commit \u0027ab20313074bb109f29f677c3f09d5da1a48c94e7\u0027:\n  Make IEffect command more robust (second try)\n"
    },
    {
      "commit": "16e12007ab1581e1b6aa973f3c83b2a45a816881",
      "tree": "9da41b0e4128f745378921241ba9a4fafd5f04cc",
      "parents": [
        "03b7f72b98ef0a4fa58a84a27d2f8735342faf58",
        "74888428e51a2aa123e301912d09973bd9310c33"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Sep 03 17:52:42 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Sep 03 17:52:42 2015 +0000"
      },
      "message": "am 74888428: Merge \"Fix timedtext parsing\" into klp-dev\n\n* commit \u002774888428e51a2aa123e301912d09973bd9310c33\u0027:\n  Fix timedtext parsing\n"
    },
    {
      "commit": "75143f30b31a7b38362281d0bbf6109b0e423441",
      "tree": "3f9a78756af8a9ef4abb722b06bb51555f194afb",
      "parents": [
        "c6a2815eadfce62702d58b3fa3887f24c49e1864",
        "03b7f72b98ef0a4fa58a84a27d2f8735342faf58"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Sep 03 17:24:20 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Sep 03 17:24:20 2015 +0000"
      },
      "message": "am 03b7f72b: (-s ours) am 9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp\n\n* commit \u002703b7f72b98ef0a4fa58a84a27d2f8735342faf58\u0027:\n  DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp\n"
    },
    {
      "commit": "13ff64c2db84f4e7cac3396700e333b48c42c7ee",
      "tree": "626467528e2ff75d1d312d6879988b5ec25eaab9",
      "parents": [
        "ab20313074bb109f29f677c3f09d5da1a48c94e7",
        "892354335d49f0b9fcd10e20e0c13e3cd0f1f1cb"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Thu Sep 03 17:21:20 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Sep 03 17:21:20 2015 +0000"
      },
      "message": "Merge \"Zero out return values in media binder calls\" into klp-dev"
    },
    {
      "commit": "ab20313074bb109f29f677c3f09d5da1a48c94e7",
      "tree": "43eff05e498917c23428409d1ce19603572d2155",
      "parents": [
        "74888428e51a2aa123e301912d09973bd9310c33",
        "25a634427dec455b79d73562131985ae85b98c43"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Thu Sep 03 17:16:12 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Sep 03 17:16:12 2015 +0000"
      },
      "message": "Merge \"Make IEffect command more robust (second try)\" into klp-dev"
    },
    {
      "commit": "03b7f72b98ef0a4fa58a84a27d2f8735342faf58",
      "tree": "1d5475ace4b2d3e57e6ae41a52d9560765a3ce81",
      "parents": [
        "436b32d1eb75cf20d09776549bd7f7a11fa569a1",
        "9d916c771ca32cb2d0df27b85ce3e17bb6b48eaf"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Sep 03 17:14:06 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Sep 03 17:14:06 2015 +0000"
      },
      "message": "am 9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp\n\n* commit \u00279d916c771ca32cb2d0df27b85ce3e17bb6b48eaf\u0027:\n  DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp\n"
    },
    {
      "commit": "74888428e51a2aa123e301912d09973bd9310c33",
      "tree": "44d2d37355a454f5acf1e19945f7604a9278b688",
      "parents": [
        "9d916c771ca32cb2d0df27b85ce3e17bb6b48eaf",
        "d53aced041b7214a92b1f2fd5970d895bb9934e5"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Sep 03 17:05:55 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Sep 03 17:05:55 2015 +0000"
      },
      "message": "Merge \"Fix timedtext parsing\" into klp-dev"
    },
    {
      "commit": "c6a2815eadfce62702d58b3fa3887f24c49e1864",
      "tree": "3f9a78756af8a9ef4abb722b06bb51555f194afb",
      "parents": [
        "a6c650a9e7927c7d640828cea66fc96e0bf762ce"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Sep 01 11:14:18 2015 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Sep 03 09:06:37 2015 -0700"
      },
      "message": "DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp\n\nAlso remove some CHECK\u0027s.\n\nBug: 23680780\nChange-Id: I62d0941e203e40209fa6fbe3f923f3efdc5a6c23\n(cherry picked from commit 7bb772e0c643ff3292599cf485b9dbf232bf39a4)\n"
    },
    {
      "commit": "9d916c771ca32cb2d0df27b85ce3e17bb6b48eaf",
      "tree": "2c077303c6072c6d648b9a1b68fb0607fc1afe5e",
      "parents": [
        "d26052738f7b095b7e318c8dde7f32db0a48450c"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Sep 01 11:14:18 2015 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Sep 03 09:03:40 2015 -0700"
      },
      "message": "DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp\n\nAlso remove some CHECK\u0027s.\n\nBug: 23680780\nChange-Id: I62d0941e203e40209fa6fbe3f923f3efdc5a6c23\n(cherry picked from commit 7bb772e0c643ff3292599cf485b9dbf232bf39a4)\n"
    },
    {
      "commit": "a6c650a9e7927c7d640828cea66fc96e0bf762ce",
      "tree": "ab700d0c3982672a194355220089d5d907e04507",
      "parents": [
        "184ad88ddd6bbdf01e131e8e5b75bef5be67b29b",
        "436b32d1eb75cf20d09776549bd7f7a11fa569a1"
      ],
      "author": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Thu Sep 03 07:59:29 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Sep 03 07:59:29 2015 +0000"
      },
      "message": "am 436b32d1: am d2605273: Ogg: avoid size_t overflow in base64 decoding\n\n* commit \u0027436b32d1eb75cf20d09776549bd7f7a11fa569a1\u0027:\n  Ogg: avoid size_t overflow in base64 decoding\n"
    },
    {
      "commit": "436b32d1eb75cf20d09776549bd7f7a11fa569a1",
      "tree": "11aa076f3e6dd893ee4072d8d47ff22eb57896cc",
      "parents": [
        "fba72ab0fcf7298492dcd9e3045913435d30d3a9",
        "d26052738f7b095b7e318c8dde7f32db0a48450c"
      ],
      "author": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Thu Sep 03 07:54:01 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Sep 03 07:54:01 2015 +0000"
      },
      "message": "am d2605273: Ogg: avoid size_t overflow in base64 decoding\n\n* commit \u0027d26052738f7b095b7e318c8dde7f32db0a48450c\u0027:\n  Ogg: avoid size_t overflow in base64 decoding\n"
    },
    {
      "commit": "d26052738f7b095b7e318c8dde7f32db0a48450c",
      "tree": "1b405a0f494c813126156bff30de0ebf0d6454c4",
      "parents": [
        "f394f12167fddbc755855d06b615509517c99f14"
      ],
      "author": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Wed Sep 02 16:02:19 2015 +0900"
      },
      "committer": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Thu Sep 03 06:15:02 2015 +0000"
      },
      "message": "Ogg: avoid size_t overflow in base64 decoding\n\nBug: 23707088\nChange-Id: I8d32841fee3213c721cdcc57788807ea64d19d74\n"
    },
    {
      "commit": "892354335d49f0b9fcd10e20e0c13e3cd0f1f1cb",
      "tree": "fc309fc843d7c9a627b59f0771c02edf4d1375ba",
      "parents": [
        "f394f12167fddbc755855d06b615509517c99f14"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Wed Sep 02 16:46:59 2015 -0700"
      },
      "committer": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Wed Sep 02 17:48:22 2015 -0700"
      },
      "message": "Zero out return values in media binder calls\n\nMore specifically when handling:\n* GET_STREAM_VOLUME in IAudioPolicyService, and\n* GET_CURRENT_POSITION and GET_DURATION in IMediaPlayer\n\nThis prevents leaking uninitialized values across binder in error cases.\n\nBug: 23756261\nChange-Id: I0ffd900ab12b685b0611259ade4a3efb1ec5defe\n"
    },
    {
      "commit": "25a634427dec455b79d73562131985ae85b98c43",
      "tree": "7eb4fe76d2239352ae39bf4ce75d7dc4f5e0d4bc",
      "parents": [
        "f394f12167fddbc755855d06b615509517c99f14"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Sep 01 20:07:56 2015 +0000"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed Sep 02 17:52:12 2015 +0000"
      },
      "message": "Make IEffect command more robust (second try)\n\nBug: 23540907\nChange-Id: If30cfa535ad51521053706fc40fc98d893db5bc7\n(cherry picked from commit 10e6660cc5da65b027c90489ba7ac55d1504e012)\n"
    },
    {
      "commit": "d53aced041b7214a92b1f2fd5970d895bb9934e5",
      "tree": "fbbe3de134e7cb9f5c84034d95ef047988f22cfd",
      "parents": [
        "f394f12167fddbc755855d06b615509517c99f14"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 27 13:49:32 2015 -0700"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Mon Aug 31 15:12:35 2015 +0000"
      },
      "message": "Fix timedtext parsing\n\nAdd bounds checking and fix other bugs.\n\nBug: 23284974\nBug: 23541506\nBug: 23542351\nBug: 23542352\nChange-Id: I53551efdf109ce1833e0c361efaf4cee7a851023\n"
    },
    {
      "commit": "184ad88ddd6bbdf01e131e8e5b75bef5be67b29b",
      "tree": "ddd3c0f0a9d0a5f6423405be8c7381c32ba1d528",
      "parents": [
        "b04cfdf51746dea51d2bb2f56fe9ef789fd30bd9",
        "fba72ab0fcf7298492dcd9e3045913435d30d3a9"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Fri Aug 28 21:16:40 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Aug 28 21:16:40 2015 +0000"
      },
      "message": "am fba72ab0: am f394f121: Merge \"libmedia: clear reply data for IEffect command\" into klp-dev\n\n* commit \u0027fba72ab0fcf7298492dcd9e3045913435d30d3a9\u0027:\n  libmedia: clear reply data for IEffect command\n"
    },
    {
      "commit": "fba72ab0fcf7298492dcd9e3045913435d30d3a9",
      "tree": "2401cc720a2689ec6325fd8e34b5960c1e7b785b",
      "parents": [
        "d437c77716fcf454d99b8424bb01f37643b970cc",
        "f394f12167fddbc755855d06b615509517c99f14"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Fri Aug 28 21:08:45 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Aug 28 21:08:45 2015 +0000"
      },
      "message": "am f394f121: Merge \"libmedia: clear reply data for IEffect command\" into klp-dev\n\n* commit \u0027f394f12167fddbc755855d06b615509517c99f14\u0027:\n  libmedia: clear reply data for IEffect command\n"
    },
    {
      "commit": "f394f12167fddbc755855d06b615509517c99f14",
      "tree": "ba4c05bbdf64aa56ac6fc0c6bf789d23065b8b85",
      "parents": [
        "0981df6e3db106bfb7a56a2b668c012fcc34dd2c",
        "57bed83a539535bb64a33722fb67231119cb0618"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Fri Aug 28 20:49:57 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Aug 28 20:49:57 2015 +0000"
      },
      "message": "Merge \"libmedia: clear reply data for IEffect command\" into klp-dev"
    },
    {
      "commit": "b04cfdf51746dea51d2bb2f56fe9ef789fd30bd9",
      "tree": "a0fd09bfc71ce313ff07a611621968cd0000c477",
      "parents": [
        "35a7b54e828336121d26060dd7e7adb5f5027d32",
        "d437c77716fcf454d99b8424bb01f37643b970cc"
      ],
      "author": {
        "name": "Nick Kralevich",
        "email": "nnk@google.com",
        "time": "Thu Aug 27 21:51:52 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 27 21:51:52 2015 +0000"
      },
      "message": "am d437c777: am 0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0\n\n* commit \u0027d437c77716fcf454d99b8424bb01f37643b970cc\u0027:\n  IMediaPlayer.cpp: make sure structures are initialized to 0\n"
    },
    {
      "commit": "d437c77716fcf454d99b8424bb01f37643b970cc",
      "tree": "48e065894ed784e875e4005a6abfe75d71d99ac7",
      "parents": [
        "f9a51893d739000cd70caf10c83d0e603371f5b1",
        "0981df6e3db106bfb7a56a2b668c012fcc34dd2c"
      ],
      "author": {
        "name": "Nick Kralevich",
        "email": "nnk@google.com",
        "time": "Thu Aug 27 21:45:45 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 27 21:45:45 2015 +0000"
      },
      "message": "am 0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0\n\n* commit \u00270981df6e3db106bfb7a56a2b668c012fcc34dd2c\u0027:\n  IMediaPlayer.cpp: make sure structures are initialized to 0\n"
    },
    {
      "commit": "0981df6e3db106bfb7a56a2b668c012fcc34dd2c",
      "tree": "dc6913625ac7d7897ae45adecc82cd9e454ebb6b",
      "parents": [
        "9a2be5d49d57b239bf6345f033eab01ba98f3889"
      ],
      "author": {
        "name": "Nick Kralevich",
        "email": "nnk@google.com",
        "time": "Thu Aug 20 09:56:39 2015 -0700"
      },
      "committer": {
        "name": "Nick Kralevich",
        "email": "nnk@google.com",
        "time": "Thu Aug 27 21:10:32 2015 +0000"
      },
      "message": "IMediaPlayer.cpp: make sure structures are initialized to 0\n\nCredit https://code.google.com/p/android/issues/detail?id\u003d183310\n\nBug: 23515142\nChange-Id: Idbd66fb148bd0ac1dd78f8651d0164f2a41e2427\n(cherry picked from commit b73b826cc16291b33649402497efbe0f946413bd)\n"
    },
    {
      "commit": "57bed83a539535bb64a33722fb67231119cb0618",
      "tree": "d27a064540c9761fd8c2c5f804232596f07e8bae",
      "parents": [
        "9a2be5d49d57b239bf6345f033eab01ba98f3889"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed Aug 26 16:34:33 2015 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Thu Aug 27 00:06:18 2015 +0000"
      },
      "message": "libmedia: clear reply data for IEffect command\n\nBug: 23540907\nChange-Id: Ib89afc6b273b0eb310bbc5a1bd92b1e3d407c249\n"
    },
    {
      "commit": "35a7b54e828336121d26060dd7e7adb5f5027d32",
      "tree": "10879bbdbf89a976374541cd72c91dfc342a2995",
      "parents": [
        "b504ca537ca206661ab60d774927032bae52dc35",
        "f9a51893d739000cd70caf10c83d0e603371f5b1"
      ],
      "author": {
        "name": "Abhishek Arya",
        "email": "aarya@google.com",
        "time": "Tue Aug 25 05:30:46 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Aug 25 05:30:46 2015 +0000"
      },
      "message": "am f9a51893: (-s ours) am 9a2be5d4: Merge \"DO NOT MERGE - Fix software video decoder buffer size calculation\" into klp-dev\n\n* commit \u0027f9a51893d739000cd70caf10c83d0e603371f5b1\u0027:\n  DO NOT MERGE - Fix software video decoder buffer size calculation\n"
    },
    {
      "commit": "b504ca537ca206661ab60d774927032bae52dc35",
      "tree": "10879bbdbf89a976374541cd72c91dfc342a2995",
      "parents": [
        "4f797b92b6e6d21a88c6b9b85a6cba38bfd04e3a",
        "3a7ff4c754fcb99c29621ed94b08ed6fb65f6495"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Aug 25 05:30:44 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Aug 25 05:30:44 2015 +0000"
      },
      "message": "am 3a7ff4c7: (-s ours) am a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.\n\n* commit \u00273a7ff4c754fcb99c29621ed94b08ed6fb65f6495\u0027:\n  DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.\n"
    },
    {
      "commit": "f9a51893d739000cd70caf10c83d0e603371f5b1",
      "tree": "59bfac3aa52dc9bf83a30b92611e50920d682786",
      "parents": [
        "3a7ff4c754fcb99c29621ed94b08ed6fb65f6495",
        "9a2be5d49d57b239bf6345f033eab01ba98f3889"
      ],
      "author": {
        "name": "Abhishek Arya",
        "email": "aarya@google.com",
        "time": "Tue Aug 25 05:23:24 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Aug 25 05:23:24 2015 +0000"
      },
      "message": "am 9a2be5d4: Merge \"DO NOT MERGE - Fix software video decoder buffer size calculation\" into klp-dev\n\n* commit \u00279a2be5d49d57b239bf6345f033eab01ba98f3889\u0027:\n  DO NOT MERGE - Fix software video decoder buffer size calculation\n"
    },
    {
      "commit": "3a7ff4c754fcb99c29621ed94b08ed6fb65f6495",
      "tree": "fdabcece239722f3fc1c55f41bbbf7e77c87b91b",
      "parents": [
        "0f3ab16c827a43534597cb38515951ff736f9740",
        "a5f50e98d1408addcaaac27e4d13981163d12a15"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Aug 25 05:23:23 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Aug 25 05:23:23 2015 +0000"
      },
      "message": "am a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.\n\n* commit \u0027a5f50e98d1408addcaaac27e4d13981163d12a15\u0027:\n  DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.\n"
    },
    {
      "commit": "4f797b92b6e6d21a88c6b9b85a6cba38bfd04e3a",
      "tree": "10879bbdbf89a976374541cd72c91dfc342a2995",
      "parents": [
        "dc5e47f013bfbb74c5c35ad976aa98d480cb351b",
        "7aa86ecdf4a8b981aed2b6717e6a104a360d18c0"
      ],
      "author": {
        "name": "Abhishek Arya",
        "email": "aarya@google.com",
        "time": "Tue Aug 25 04:00:11 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Aug 25 04:00:11 2015 +0000"
      },
      "message": "Merge \"DO NOT MERGE - Fix software video decoder buffer size calculation\" into lmp-dev"
    },
    {
      "commit": "9a2be5d49d57b239bf6345f033eab01ba98f3889",
      "tree": "e0417802932d787daf906e84938864898624c6be",
      "parents": [
        "a5f50e98d1408addcaaac27e4d13981163d12a15",
        "0f3e2daa1d56c98196a719a6e641f3ed67b8e7bf"
      ],
      "author": {
        "name": "Abhishek Arya",
        "email": "aarya@google.com",
        "time": "Tue Aug 25 04:00:04 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Aug 25 04:00:04 2015 +0000"
      },
      "message": "Merge \"DO NOT MERGE - Fix software video decoder buffer size calculation\" into klp-dev"
    },
    {
      "commit": "7aa86ecdf4a8b981aed2b6717e6a104a360d18c0",
      "tree": "0436005c84b8153b0f6b113ae60cfbd995ad4d62",
      "parents": [
        "252a8c0956fe5a10bc18d9d4c6337edf29657d72"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Tue Jun 16 14:50:36 2015 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Mon Aug 24 16:10:58 2015 -0700"
      },
      "message": "DO NOT MERGE - Fix software video decoder buffer size calculation\n\nVarious software video decoders would specify the buffer size as if it were\nfully cropped, which then failed a sanity check in SoftwareRenderer.\nThey now return the full buffer size.\n\nBug: 21717327\nBug: 21443020\nChange-Id: I19fcd091827ebd52a95a5509281a07ccc156e0e5\n(cherry picked from commit 3ecc9db40b1fb9c7f807a5892e5c9625aac1fb06)\n"
    },
    {
      "commit": "0f3e2daa1d56c98196a719a6e641f3ed67b8e7bf",
      "tree": "14f425887bc762b2a8d5f2d0dd521e931924eef0",
      "parents": [
        "af7e33f6043c0be1c0310d675884e3b263ca2438"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Tue Jun 16 14:50:36 2015 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Mon Aug 24 16:07:03 2015 -0700"
      },
      "message": "DO NOT MERGE - Fix software video decoder buffer size calculation\n\nVarious software video decoders would specify the buffer size as if it were\nfully cropped, which then failed a sanity check in SoftwareRenderer.\nThey now return the full buffer size.\n\nBug: 21717327\nBug: 21443020\nChange-Id: I19fcd091827ebd52a95a5509281a07ccc156e0e5\n(cherry picked from commit 3ecc9db40b1fb9c7f807a5892e5c9625aac1fb06)\n"
    },
    {
      "commit": "dc5e47f013bfbb74c5c35ad976aa98d480cb351b",
      "tree": "be28037ffd63652ab9906a0aa65396a30baa1148",
      "parents": [
        "252a8c0956fe5a10bc18d9d4c6337edf29657d72"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Mon Jun 08 14:01:42 2015 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Mon Aug 24 15:42:10 2015 -0700"
      },
      "message": "DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.\n\nBug: 21443020\nChange-Id: I63cf86217b8201fb41809c23e4b752b845a93ee2\n(cherry picked from commit 760f92f8b6da9c9cf128cb18fe3c09402fdde6cd)\n"
    },
    {
      "commit": "a5f50e98d1408addcaaac27e4d13981163d12a15",
      "tree": "2706b904207936fc151c1de10781d614b1e5994b",
      "parents": [
        "af7e33f6043c0be1c0310d675884e3b263ca2438"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Mon Jun 08 14:01:42 2015 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Mon Aug 24 22:40:48 2015 +0000"
      },
      "message": "DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.\n\nBug: 21443020\nChange-Id: I63cf86217b8201fb41809c23e4b752b845a93ee2\n(cherry picked from commit 760f92f8b6da9c9cf128cb18fe3c09402fdde6cd)\n"
    },
    {
      "commit": "252a8c0956fe5a10bc18d9d4c6337edf29657d72",
      "tree": "7145205c3ba821bdbfc9fa8029333cf5ec488089",
      "parents": [
        "d18bb120442fcc04efe269e6a26f83265eea40c8",
        "0f3ab16c827a43534597cb38515951ff736f9740"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Sun Aug 23 19:15:04 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Sun Aug 23 19:15:04 2015 +0000"
      },
      "message": "am 0f3ab16c: am af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp\n\n* commit \u00270f3ab16c827a43534597cb38515951ff736f9740\u0027:\n  libstagefright: check overflow before memory allocation in OMXCodec.cpp\n"
    },
    {
      "commit": "d18bb120442fcc04efe269e6a26f83265eea40c8",
      "tree": "85dd5cdbfe6a9d3b880cb73cdd4a22f69961c0e6",
      "parents": [
        "8cf3564d2dd522f7a707a8fd109d415dab3def47",
        "09f71c5621799e0f030b4a8058d2fb4df5977de0"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Sun Aug 23 19:15:02 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Sun Aug 23 19:15:02 2015 +0000"
      },
      "message": "am 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memory\n\n* commit \u002709f71c5621799e0f030b4a8058d2fb4df5977de0\u0027:\n  Limit allocations to avoid out-of-memory\n"
    },
    {
      "commit": "0f3ab16c827a43534597cb38515951ff736f9740",
      "tree": "95080853408701da82e7bccc60632cb6fd655fb2",
      "parents": [
        "09f71c5621799e0f030b4a8058d2fb4df5977de0",
        "af7e33f6043c0be1c0310d675884e3b263ca2438"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Sun Aug 23 19:08:27 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Sun Aug 23 19:08:27 2015 +0000"
      },
      "message": "am af7e33f6: libstagefright: check overflow before memory allocation in OMXCodec.cpp\n\n* commit \u0027af7e33f6043c0be1c0310d675884e3b263ca2438\u0027:\n  libstagefright: check overflow before memory allocation in OMXCodec.cpp\n"
    },
    {
      "commit": "09f71c5621799e0f030b4a8058d2fb4df5977de0",
      "tree": "e3f6d8a851739e695ddc2795dd9cd2366eef45c7",
      "parents": [
        "eecc406f462ef2b3a73cd6bf3c05f7cb45382276",
        "dedaca6f04ac9f95fabe3b64d44cd1a2050f079e"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Sun Aug 23 19:08:25 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Sun Aug 23 19:08:25 2015 +0000"
      },
      "message": "am dedaca6f: Limit allocations to avoid out-of-memory\n\n* commit \u0027dedaca6f04ac9f95fabe3b64d44cd1a2050f079e\u0027:\n  Limit allocations to avoid out-of-memory\n"
    },
    {
      "commit": "af7e33f6043c0be1c0310d675884e3b263ca2438",
      "tree": "5f5f7e097366757a2640ddb0cc5f5b65090d5f0f",
      "parents": [
        "dedaca6f04ac9f95fabe3b64d44cd1a2050f079e"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Aug 21 16:49:51 2015 -0700"
      },
      "committer": {
        "name": "Abhishek Arya",
        "email": "aarya@google.com",
        "time": "Sun Aug 23 12:42:34 2015 +0000"
      },
      "message": "libstagefright: check overflow before memory allocation in OMXCodec.cpp\n\nBug: 23416608\nChange-Id: I4dacd38ed42db8f4887c3ee386dc909451f4346f\n"
    },
    {
      "commit": "dedaca6f04ac9f95fabe3b64d44cd1a2050f079e",
      "tree": "aac33f0ddaaae3cf66043bb3e801fc53a635afbe",
      "parents": [
        "3b42241aab5855964d1bd60268ae21c2d9cc6065"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Jun 04 11:01:15 2015 -0700"
      },
      "committer": {
        "name": "Abhishek Arya",
        "email": "aarya@google.com",
        "time": "Fri Aug 21 21:34:14 2015 -0700"
      },
      "message": "Limit allocations to avoid out-of-memory\n\nCorrupt files could cause very large allocations, limit them to something\nmore reasonable.\n\nBug: 17769851\nChange-Id: Ib0f722fd6fddff873bd7a547aac456e608c34c84\n"
    },
    {
      "commit": "8cf3564d2dd522f7a707a8fd109d415dab3def47",
      "tree": "50ce34e3ac31f1db90bd2c2992680e397f833ba7",
      "parents": [
        "8319fadb99f5d862ed68d44a587b6f1fac2e0d2d",
        "eecc406f462ef2b3a73cd6bf3c05f7cb45382276"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Sat Aug 22 01:18:32 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Sat Aug 22 01:18:32 2015 +0000"
      },
      "message": "am eecc406f: am 3b42241a: Merge \"Prevent integer issues in ID3::Iterator::findFrame\" into klp-dev\n\n* commit \u0027eecc406f462ef2b3a73cd6bf3c05f7cb45382276\u0027:\n  Prevent integer issues in ID3::Iterator::findFrame\n"
    },
    {
      "commit": "eecc406f462ef2b3a73cd6bf3c05f7cb45382276",
      "tree": "b2a5d72348212afbe32b9ee8a15ae34bbe1dfddb",
      "parents": [
        "f814f84e09191af23bbf8d307f02704e20cc887c",
        "3b42241aab5855964d1bd60268ae21c2d9cc6065"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Sat Aug 22 01:08:44 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Sat Aug 22 01:08:44 2015 +0000"
      },
      "message": "am 3b42241a: Merge \"Prevent integer issues in ID3::Iterator::findFrame\" into klp-dev\n\n* commit \u00273b42241aab5855964d1bd60268ae21c2d9cc6065\u0027:\n  Prevent integer issues in ID3::Iterator::findFrame\n"
    },
    {
      "commit": "3b42241aab5855964d1bd60268ae21c2d9cc6065",
      "tree": "26b23cae8b66ba01e49d516e1ee7a19519dc949a",
      "parents": [
        "d8816a13dbcafd5d61d26a8a6b2e892452bca1a7",
        "c580c836c1941fb4912e1dd4e08626caf98a62c7"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Sat Aug 22 00:54:32 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Sat Aug 22 00:54:32 2015 +0000"
      },
      "message": "Merge \"Prevent integer issues in ID3::Iterator::findFrame\" into klp-dev"
    },
    {
      "commit": "c580c836c1941fb4912e1dd4e08626caf98a62c7",
      "tree": "11be8eb2577972b3c522503701a59af125ca0729",
      "parents": [
        "916a9684295fb578f4b3c6c16b621ef201a49964"
      ],
      "author": {
        "name": "Joshua J. Drake",
        "email": "android-open-source@qoop.org",
        "time": "Sat Aug 15 08:17:03 2015 -0500"
      },
      "committer": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Fri Aug 21 16:06:23 2015 -0700"
      },
      "message": "Prevent integer issues in ID3::Iterator::findFrame\n\nInteger overflows could occur a few places within findFrame. These can lead to\nout-of-bounds reads and potentially infinite loops. Ensure that arithmetic does\nnot wrap around to prevent these behaviors.\n\nBug: 23285192\nChange-Id: I72a61df7d5719d1d3f2bd0b37fba86f0f4bbedee\n"
    },
    {
      "commit": "8319fadb99f5d862ed68d44a587b6f1fac2e0d2d",
      "tree": "849d18a0d5ad54470904bfbfe7e24004ede61cb3",
      "parents": [
        "e4a9d859e10930f187fc037e0a1cc8d1eb5c21c5",
        "f814f84e09191af23bbf8d307f02704e20cc887c"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Aug 21 20:03:06 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Aug 21 20:03:06 2015 +0000"
      },
      "message": "am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage\n\n* commit \u0027f814f84e09191af23bbf8d307f02704e20cc887c\u0027:\n  DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage\n"
    },
    {
      "commit": "f814f84e09191af23bbf8d307f02704e20cc887c",
      "tree": "db92ff44d1d3c45e05b96db5b2f49942cf0c359e",
      "parents": [
        "ca095ac251ad02ad745d763f37ec3fcc5a8aa2ea",
        "d8816a13dbcafd5d61d26a8a6b2e892452bca1a7"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Aug 21 19:57:30 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Aug 21 19:57:30 2015 +0000"
      },
      "message": "am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage\n\n* commit \u0027d8816a13dbcafd5d61d26a8a6b2e892452bca1a7\u0027:\n  DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage\n"
    },
    {
      "commit": "d8816a13dbcafd5d61d26a8a6b2e892452bca1a7",
      "tree": "cfc5148417101a6c3b7008179ab6dd5b29b836d3",
      "parents": [
        "8de6d690ae5843bd8e005deedea571596f79bbd3"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Jun 25 11:46:54 2015 -0700"
      },
      "committer": {
        "name": "Nick Kralevich",
        "email": "nnk@google.com",
        "time": "Fri Aug 21 12:36:27 2015 -0700"
      },
      "message": "DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage\n\n- The ABuffer used for the Message has a preset value of 1024, if\n  flattening the meta data exceeds this value, a check fails hence\n  the crash.\n- This change creates a new ABuffer if the buffer size would exceed\n  the buffer capacity.\n\nBug: 22771132\n\nCRs-Fixed: 857850\n\n(cherry picked from commit 4bce636865bdf0e2a79fc9a5d9a69107649c850d)\n\nChange-Id: Ia0a963e9872f646791e75b710ff9e227a66af4f9\n"
    },
    {
      "commit": "e4a9d859e10930f187fc037e0a1cc8d1eb5c21c5",
      "tree": "849d18a0d5ad54470904bfbfe7e24004ede61cb3",
      "parents": [
        "f8bf4acb505d8058e75b8b6f19738ee2c9a4322e",
        "ca095ac251ad02ad745d763f37ec3fcc5a8aa2ea"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Aug 21 18:59:11 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Aug 21 18:59:11 2015 +0000"
      },
      "message": "am ca095ac2: (-s ours) am 8de6d690: Fix build break DO NOT MERGE\n\n* commit \u0027ca095ac251ad02ad745d763f37ec3fcc5a8aa2ea\u0027:\n  Fix build break DO NOT MERGE\n"
    },
    {
      "commit": "ca095ac251ad02ad745d763f37ec3fcc5a8aa2ea",
      "tree": "f5e0756fd218a0e06e61ce391d2b61e6c88c555d",
      "parents": [
        "fd1d6df52f4c33f59d44abdbcdd0ec5b9a20f059",
        "8de6d690ae5843bd8e005deedea571596f79bbd3"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Aug 21 18:51:27 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Aug 21 18:51:27 2015 +0000"
      },
      "message": "am 8de6d690: Fix build break DO NOT MERGE\n\n* commit \u00278de6d690ae5843bd8e005deedea571596f79bbd3\u0027:\n  Fix build break DO NOT MERGE\n"
    },
    {
      "commit": "8de6d690ae5843bd8e005deedea571596f79bbd3",
      "tree": "de83a9d8986206f202dd2c34bd62116be39474d6",
      "parents": [
        "c2153d0dc800d0718788dccd0f2a2d29f4647c03"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Aug 21 09:58:12 2015 -0700"
      },
      "committer": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Aug 21 18:32:29 2015 +0000"
      },
      "message": "Fix build break DO NOT MERGE\n\nrelated-to-bug: 23223325\n\nChange-Id: I7b09712b5f18912abddd50b75f6edaf860e894c1\n"
    },
    {
      "commit": "f8bf4acb505d8058e75b8b6f19738ee2c9a4322e",
      "tree": "849d18a0d5ad54470904bfbfe7e24004ede61cb3",
      "parents": [
        "8cc71bc8f32ba85fc7e2b9dac0d7450147a4f3db",
        "fd1d6df52f4c33f59d44abdbcdd0ec5b9a20f059"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Aug 21 16:27:33 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Aug 21 16:27:33 2015 +0000"
      },
      "message": "am fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere\n\n* commit \u0027fd1d6df52f4c33f59d44abdbcdd0ec5b9a20f059\u0027:\n  DO NOT MERGE Part of fix for libmedia OOB write anywhere\n"
    },
    {
      "commit": "fd1d6df52f4c33f59d44abdbcdd0ec5b9a20f059",
      "tree": "457d61467a5f2f5797b695565dfd3e46310f8534",
      "parents": [
        "f839b2a33c46f3520684f0a839760cca36a6b4c7",
        "c2153d0dc800d0718788dccd0f2a2d29f4647c03"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Aug 21 15:36:21 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Aug 21 15:36:21 2015 +0000"
      },
      "message": "am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere\n\n* commit \u0027c2153d0dc800d0718788dccd0f2a2d29f4647c03\u0027:\n  DO NOT MERGE Part of fix for libmedia OOB write anywhere\n"
    },
    {
      "commit": "8cc71bc8f32ba85fc7e2b9dac0d7450147a4f3db",
      "tree": "849d18a0d5ad54470904bfbfe7e24004ede61cb3",
      "parents": [
        "008807813e8fd703f89bf84c8f2c725bb19a434f",
        "aa4da6fa7ca2454f0713de0a5a583b5b8160166b"
      ],
      "author": {
        "name": "Abhishek Arya",
        "email": "aarya@google.com",
        "time": "Fri Aug 21 15:22:37 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Aug 21 15:22:37 2015 +0000"
      },
      "message": "Merge \"DO NOT MERGE Part of fix for libmedia OOB write anywhere\" into lmp-dev"
    },
    {
      "commit": "c2153d0dc800d0718788dccd0f2a2d29f4647c03",
      "tree": "24cd6439538e4bf3fd0007757d86dbcb63a465a9",
      "parents": [
        "5aa887ef44238e9a727564fe9051933f8b42e399"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Mon Aug 17 17:57:47 2015 -0700"
      },
      "committer": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Thu Aug 20 14:55:35 2015 -0700"
      },
      "message": "DO NOT MERGE Part of fix for libmedia OOB write anywhere\n\nClarify that decrypt destination is not a pointer for\nsecure case.\n\nb/23223325\n\nChange-Id: I642dcf790a9eb9e32175f3e0d8f040c82228e3ac\n(cherry picked from commit ed555d70d80964f40563d89a4e6d6a80f83f4b89)\n"
    },
    {
      "commit": "008807813e8fd703f89bf84c8f2c725bb19a434f",
      "tree": "61fff244959003be547572314622184b4ae0141a",
      "parents": [
        "d4f0d88e701f5323621bd352cf4cbcd14bc349c4",
        "f839b2a33c46f3520684f0a839760cca36a6b4c7"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 20:39:14 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 20:39:14 2015 +0000"
      },
      "message": "am f839b2a3: (-s ours) am 5aa887ef: am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u0027f839b2a33c46f3520684f0a839760cca36a6b4c7\u0027:\n  DO NOT MERGE Fail more gracefully on allocation failure\n"
    },
    {
      "commit": "f839b2a33c46f3520684f0a839760cca36a6b4c7",
      "tree": "ae30f2a2cb0aa4aac6be286d42f30d6d97b32c79",
      "parents": [
        "eb10ccbc9dcab8ec3ee22a1c2b2db4a673c6fdc2",
        "5aa887ef44238e9a727564fe9051933f8b42e399"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 20:30:04 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 20:30:04 2015 +0000"
      },
      "message": "am 5aa887ef: am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u00275aa887ef44238e9a727564fe9051933f8b42e399\u0027:\n  DO NOT MERGE Fail more gracefully on allocation failure\n"
    },
    {
      "commit": "5aa887ef44238e9a727564fe9051933f8b42e399",
      "tree": "45e6c5d00c653db833f26e6f14e2adb26cf3871c",
      "parents": [
        "8a064aa83ad590b61ddd84e678c59f0d1f68106c",
        "59bfb7aa42ce2404da2547e7852e1a1215c6af22"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 20:17:34 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 20:17:34 2015 +0000"
      },
      "message": "am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u002759bfb7aa42ce2404da2547e7852e1a1215c6af22\u0027:\n  DO NOT MERGE Fail more gracefully on allocation failure\n"
    },
    {
      "commit": "aa4da6fa7ca2454f0713de0a5a583b5b8160166b",
      "tree": "849d18a0d5ad54470904bfbfe7e24004ede61cb3",
      "parents": [
        "d4f0d88e701f5323621bd352cf4cbcd14bc349c4"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Mon Aug 17 17:57:47 2015 -0700"
      },
      "committer": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Thu Aug 20 20:16:22 2015 +0000"
      },
      "message": "DO NOT MERGE Part of fix for libmedia OOB write anywhere\n\nClarify that decrypt destination is not a pointer for\nsecure case.\n\nb/23223325\n\nChange-Id: I642dcf790a9eb9e32175f3e0d8f040c82228e3ac\n(cherry picked from commit ed555d70d80964f40563d89a4e6d6a80f83f4b89)\n"
    },
    {
      "commit": "59bfb7aa42ce2404da2547e7852e1a1215c6af22",
      "tree": "f761d21bfae5e0e042ee41ae0fb43fc149850f07",
      "parents": [
        "9d9491f9fb83523cfe68f2aa26c14f72f70812fc",
        "18a8124f582e9d763670e3bcc6ef6b2b00c4d394"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 20:11:03 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 20:11:03 2015 +0000"
      },
      "message": "am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u002718a8124f582e9d763670e3bcc6ef6b2b00c4d394\u0027:\n  DO NOT MERGE Fail more gracefully on allocation failure\n"
    },
    {
      "commit": "18a8124f582e9d763670e3bcc6ef6b2b00c4d394",
      "tree": "62abbda0ae5ac64359add878f6adfbd59098b55e",
      "parents": [
        "0dbd0d7bfe340ac46271c7f87969431b62a023ed",
        "da0a48d2704b231f13dbdb28cc4c4d12b08e3faf"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 19:53:55 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 19:53:55 2015 +0000"
      },
      "message": "am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u0027da0a48d2704b231f13dbdb28cc4c4d12b08e3faf\u0027:\n  DO NOT MERGE Fail more gracefully on allocation failure\n"
    },
    {
      "commit": "da0a48d2704b231f13dbdb28cc4c4d12b08e3faf",
      "tree": "7a2fa8ee998e8d01518e93e19ba9090cd438df51",
      "parents": [
        "c99244105803ac32f4cc698b5b2a85b225d925a2",
        "6020f06633f8cac09f47e561cc389c5b9b152464"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 19:46:41 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 19:46:41 2015 +0000"
      },
      "message": "am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u00276020f06633f8cac09f47e561cc389c5b9b152464\u0027:\n  DO NOT MERGE Fail more gracefully on allocation failure\n"
    },
    {
      "commit": "6020f06633f8cac09f47e561cc389c5b9b152464",
      "tree": "d40a01deb5043dbf7c1f01c29165f74719b1b717",
      "parents": [
        "2fe61ed032e083dc39265f3b88274fcb8fbeed9b",
        "b294a97a6fed15d379ce11084166780e7d9dd883"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 19:41:14 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 19:41:14 2015 +0000"
      },
      "message": "am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u0027b294a97a6fed15d379ce11084166780e7d9dd883\u0027:\n  DO NOT MERGE Fail more gracefully on allocation failure\n"
    },
    {
      "commit": "b294a97a6fed15d379ce11084166780e7d9dd883",
      "tree": "dcd7a6d38c54741226217640d97390577d0c841b",
      "parents": [
        "3b8d3fa0dd97c05f77c4686986812e40203678d2",
        "6cba5819ab84cc58a8273428dcf9ae98c0c9bc42"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 19:32:06 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 19:32:06 2015 +0000"
      },
      "message": "am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u00276cba5819ab84cc58a8273428dcf9ae98c0c9bc42\u0027:\n  DO NOT MERGE Fail more gracefully on allocation failure\n"
    },
    {
      "commit": "6cba5819ab84cc58a8273428dcf9ae98c0c9bc42",
      "tree": "dcd7a6d38c54741226217640d97390577d0c841b",
      "parents": [
        "186d1fb9b72439c1c3317d72e4a0f52f466e6861",
        "51bfaf6cf74498f92cd400e4d5b3d55b04fc7a06"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 19:25:42 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 19:25:42 2015 +0000"
      },
      "message": "am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u002751bfaf6cf74498f92cd400e4d5b3d55b04fc7a06\u0027:\n  DO NOT MERGE Fail more gracefully on allocation failure\n"
    },
    {
      "commit": "51bfaf6cf74498f92cd400e4d5b3d55b04fc7a06",
      "tree": "065653ca656c926c0c7e8fcf2b3326cf80c0e196",
      "parents": [
        "f4dfe12ecd26e7d6965a2abc062709b6d7d942c4",
        "1afea5517477554f452396c29db375e34d108f89"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 19:18:30 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 19:18:30 2015 +0000"
      },
      "message": "am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u00271afea5517477554f452396c29db375e34d108f89\u0027:\n  DO NOT MERGE Fail more gracefully on allocation failure\n"
    },
    {
      "commit": "1afea5517477554f452396c29db375e34d108f89",
      "tree": "0c15d1d2b118f34fc25eddbb80dcaacf73318c3f",
      "parents": [
        "54d88fe2f17b1c5c6e4d0d1d1e36089fea3a1df0",
        "ce73af077199122e0e5a80b019f949d0f181410f"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 19:12:29 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 19:12:29 2015 +0000"
      },
      "message": "am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure\n\n* commit \u0027ce73af077199122e0e5a80b019f949d0f181410f\u0027:\n  DO NOT MERGE Fail more gracefully on allocation failure\n"
    },
    {
      "commit": "d4f0d88e701f5323621bd352cf4cbcd14bc349c4",
      "tree": "61fff244959003be547572314622184b4ae0141a",
      "parents": [
        "ef87594bd821520cdc46e30036c16ee2eb5becb3",
        "eb10ccbc9dcab8ec3ee22a1c2b2db4a673c6fdc2"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 11:45:19 2015 -0700"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 11:45:19 2015 -0700"
      },
      "message": "resolved conflicts for merge of eb10ccbc to lmp-dev\n\nChange-Id: I1d3220bcfe53ab6ad9dba87ef8e41b52f3bb1f30\n"
    },
    {
      "commit": "eb10ccbc9dcab8ec3ee22a1c2b2db4a673c6fdc2",
      "tree": "ae30f2a2cb0aa4aac6be286d42f30d6d97b32c79",
      "parents": [
        "d7c205fe1f7cda2cdcb3062b548c0777402bab38",
        "8a064aa83ad590b61ddd84e678c59f0d1f68106c"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 11:29:58 2015 -0700"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 11:29:58 2015 -0700"
      },
      "message": "resolved conflicts for merge of 8a064aa8 to klp-modular-dev\n\nChange-Id: If031955c9edca657401831fbfa5a128f0b4c6d86\n"
    },
    {
      "commit": "ef87594bd821520cdc46e30036c16ee2eb5becb3",
      "tree": "61fff244959003be547572314622184b4ae0141a",
      "parents": [
        "b53cdf492fafd31763631c9664874f10325b6ff7",
        "4bce636865bdf0e2a79fc9a5d9a69107649c850d"
      ],
      "author": {
        "name": "Nick Kralevich",
        "email": "nnk@google.com",
        "time": "Thu Aug 20 18:09:48 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Aug 20 18:09:48 2015 +0000"
      },
      "message": "Merge \"libstagefright: Fix crash in convertMetaDataToMessage\" into lmp-dev"
    },
    {
      "commit": "8a064aa83ad590b61ddd84e678c59f0d1f68106c",
      "tree": "45e6c5d00c653db833f26e6f14e2adb26cf3871c",
      "parents": [
        "522019f15b3c191b73d1a0ddb56aeb3dd6b7ce31",
        "3878b990f7d53eae7c2cf9246b6ef2db5a049872"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 18:05:08 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Aug 20 18:05:08 2015 +0000"
      },
      "message": "Merge \"Fail more gracefully on allocation failure\" into klp-dev"
    },
    {
      "commit": "ce73af077199122e0e5a80b019f949d0f181410f",
      "tree": "c8f1e5ccd45f35ef686e8136ea3451c53d36bba8",
      "parents": [
        "aa8dab77aa9ef1bb6e5414ee5e773001de725bef"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Jun 13 14:13:44 2014 -0700"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 18:01:20 2015 +0000"
      },
      "message": "DO NOT MERGE Fail more gracefully on allocation failure\n\nCheck allocations when the size is read from a file and might therefore\nbe invalid.\n\nb/14388161\n\nChange-Id: Ia08cc0a6107f275a70e793ef3b50c0ce16ceeee0\n"
    },
    {
      "commit": "b53cdf492fafd31763631c9664874f10325b6ff7",
      "tree": "cf9fed3a45827c1b17e214957ed8e5f5c2133cf1",
      "parents": [
        "2fd79fa39a0ec347a80ceb5b056ed5053002f59e",
        "d7c205fe1f7cda2cdcb3062b548c0777402bab38"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Aug 20 17:51:08 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 17:51:08 2015 +0000"
      },
      "message": "am d7c205fe: am 522019f1: Merge \"libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.\" into klp-dev\n\n* commit \u0027d7c205fe1f7cda2cdcb3062b548c0777402bab38\u0027:\n  libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.\n"
    },
    {
      "commit": "2fd79fa39a0ec347a80ceb5b056ed5053002f59e",
      "tree": "cf9fed3a45827c1b17e214957ed8e5f5c2133cf1",
      "parents": [
        "8a55bcb640c8842348eb41495fdb8fe82cb0465d",
        "cb2acbfed69d18aa4693c03d8a77cd45daf8af8d"
      ],
      "author": {
        "name": "Abhishek Arya",
        "email": "aarya@google.com",
        "time": "Thu Aug 20 17:51:05 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 17:51:05 2015 +0000"
      },
      "message": "am cb2acbfe: am 635d38a8: Merge \"Check RTSP payload length\" into klp-dev\n\n* commit \u0027cb2acbfed69d18aa4693c03d8a77cd45daf8af8d\u0027:\n  Check RTSP payload length\n"
    },
    {
      "commit": "8a55bcb640c8842348eb41495fdb8fe82cb0465d",
      "tree": "41f51f4322964bf2e296821d8a6f0c8863234603",
      "parents": [
        "2562495de9338e14ca3a3ef74ce07a7b310cd1fb",
        "ced2dd3ccf8920621b931bb4b5d9df9a9a23449a"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 10:26:33 2015 -0700"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 20 10:26:33 2015 -0700"
      },
      "message": "resolved conflicts for merge of ced2dd3c to lmp-dev\n\nChange-Id: I5dbb4f7d6c38c75a54c59d5e59305657bc50ab10\n"
    },
    {
      "commit": "d7c205fe1f7cda2cdcb3062b548c0777402bab38",
      "tree": "7c2af71957bb9d7bd6f2c6131ef6144850db5f8c",
      "parents": [
        "cb2acbfed69d18aa4693c03d8a77cd45daf8af8d",
        "522019f15b3c191b73d1a0ddb56aeb3dd6b7ce31"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Aug 20 17:04:07 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 17:04:07 2015 +0000"
      },
      "message": "am 522019f1: Merge \"libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.\" into klp-dev\n\n* commit \u0027522019f15b3c191b73d1a0ddb56aeb3dd6b7ce31\u0027:\n  libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.\n"
    },
    {
      "commit": "cb2acbfed69d18aa4693c03d8a77cd45daf8af8d",
      "tree": "b683fa63c6b937ee01f8eea4b9b6fef1a0047391",
      "parents": [
        "ced2dd3ccf8920621b931bb4b5d9df9a9a23449a",
        "635d38a84414e26aaf6c4b5df7859fde196adeaf"
      ],
      "author": {
        "name": "Abhishek Arya",
        "email": "aarya@google.com",
        "time": "Thu Aug 20 17:04:06 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 17:04:06 2015 +0000"
      },
      "message": "am 635d38a8: Merge \"Check RTSP payload length\" into klp-dev\n\n* commit \u0027635d38a84414e26aaf6c4b5df7859fde196adeaf\u0027:\n  Check RTSP payload length\n"
    },
    {
      "commit": "ced2dd3ccf8920621b931bb4b5d9df9a9a23449a",
      "tree": "437b24d2bc2cba6bc3bbefdfa80211be2c0bc75a",
      "parents": [
        "a590baca031199327f6382347625dd232de2c95c",
        "2c880dde90e4303f9201f46124ee879325c57ba0"
      ],
      "author": {
        "name": "Abhishek Arya",
        "email": "aarya@google.com",
        "time": "Thu Aug 20 17:04:05 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 17:04:05 2015 +0000"
      },
      "message": "am 2c880dde: Merge \"Sanity check padding/delay values for gapless playback\" into klp-dev\n\n* commit \u00272c880dde90e4303f9201f46124ee879325c57ba0\u0027:\n  Sanity check padding/delay values for gapless playback\n"
    },
    {
      "commit": "2562495de9338e14ca3a3ef74ce07a7b310cd1fb",
      "tree": "81b550847bc49f1625eeb3f194f8efc65036bdb8",
      "parents": [
        "4b995f73b581ce0705b537317f32ad76bddb55fa",
        "a590baca031199327f6382347625dd232de2c95c"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Aug 20 16:53:41 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 16:53:41 2015 +0000"
      },
      "message": "am a590baca: Merge commit \\\u00276ae815e0\\\u0027 into HEAD\n\n* commit \u0027a590baca031199327f6382347625dd232de2c95c\u0027:\n  libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.\n"
    },
    {
      "commit": "a590baca031199327f6382347625dd232de2c95c",
      "tree": "40c192b35abb2006e02b514fbb5a19fafc3370cd",
      "parents": [
        "5221133bfa1585b4488b01cad165627b1cd17077",
        "6ae815e04f618207da9ce52e3c828492c33a7107"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Aug 20 09:42:08 2015 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Aug 20 09:42:08 2015 -0700"
      },
      "message": "Merge commit \u00276ae815e0\u0027 into HEAD\n\nlibstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.\n\nBug: 23270724\n(cherry picked from commit c51ab7dd82bf4e24666fc72a55e03e2f530204d5)\n\nChange-Id: I44c642548ee6ba3745fb1f46d8645bece231035a\n"
    },
    {
      "commit": "522019f15b3c191b73d1a0ddb56aeb3dd6b7ce31",
      "tree": "bbed47079f06124d972e5f1d8bff8d00ea3b4794",
      "parents": [
        "635d38a84414e26aaf6c4b5df7859fde196adeaf",
        "108cd2dc8df55f3f2ecdfbb4bb0ae981a74b6860"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Aug 20 04:27:23 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Aug 20 04:27:23 2015 +0000"
      },
      "message": "Merge \"libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.\" into klp-dev"
    },
    {
      "commit": "4b995f73b581ce0705b537317f32ad76bddb55fa",
      "tree": "fbef9d0625edd8e0c489b88061026c04c292fad1",
      "parents": [
        "a9b3cd3c101b68522a3d8492cb3a19d8b5409329",
        "5a132594b531f1f48098a790927f82080cc27f61"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Aug 20 04:25:47 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Aug 20 04:25:47 2015 +0000"
      },
      "message": "Merge \"libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.\" into lmp-dev"
    },
    {
      "commit": "a9b3cd3c101b68522a3d8492cb3a19d8b5409329",
      "tree": "e849016209326c1b563ed92be7ab2d0518419b92",
      "parents": [
        "fd5942b332c5f6e4dc50f50181344957334854e1",
        "5221133bfa1585b4488b01cad165627b1cd17077"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Aug 20 04:10:56 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 04:10:56 2015 +0000"
      },
      "message": "am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.\n\n* commit \u00275221133bfa1585b4488b01cad165627b1cd17077\u0027:\n  libstagefright: fix overflow in pvdec_api.cpp.\n"
    },
    {
      "commit": "635d38a84414e26aaf6c4b5df7859fde196adeaf",
      "tree": "e199c5f7c141ede4bf3a46996a9a6b70dfd8c0df",
      "parents": [
        "2c880dde90e4303f9201f46124ee879325c57ba0",
        "4d46f6f18f5160b8992ec1e66ef1844212fc7d48"
      ],
      "author": {
        "name": "Abhishek Arya",
        "email": "aarya@google.com",
        "time": "Thu Aug 20 04:10:51 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Aug 20 04:10:51 2015 +0000"
      },
      "message": "Merge \"Check RTSP payload length\" into klp-dev"
    },
    {
      "commit": "2c880dde90e4303f9201f46124ee879325c57ba0",
      "tree": "1046e8298b670c9aa23252f535fc3f9510bb2718",
      "parents": [
        "6ae815e04f618207da9ce52e3c828492c33a7107",
        "ba6093a4c6997b9d36d9700ee8c974941bf82e3a"
      ],
      "author": {
        "name": "Abhishek Arya",
        "email": "aarya@google.com",
        "time": "Thu Aug 20 04:06:25 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Aug 20 04:06:25 2015 +0000"
      },
      "message": "Merge \"Sanity check padding/delay values for gapless playback\" into klp-dev"
    },
    {
      "commit": "5221133bfa1585b4488b01cad165627b1cd17077",
      "tree": "6824c47d8b1cb36beb2c04f49e72a7aa1bcc7940",
      "parents": [
        "6b52d191f96c611b768318eec74d25908da76d03",
        "b2ae4351539de9aa4667fcb3e02ba40d9c6bd094"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Aug 20 04:04:08 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Aug 20 04:04:08 2015 +0000"
      },
      "message": "am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.\n\n* commit \u0027b2ae4351539de9aa4667fcb3e02ba40d9c6bd094\u0027:\n  libstagefright: fix overflow in pvdec_api.cpp.\n"
    },
    {
      "commit": "6ae815e04f618207da9ce52e3c828492c33a7107",
      "tree": "42f8cf5d811238df117abba1a9848b32c6f2d8fb",
      "parents": [
        "b2ae4351539de9aa4667fcb3e02ba40d9c6bd094",
        "937c6bedd4b6e5c6cb29a238eb459047dedd3486"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Aug 20 04:01:18 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Aug 20 04:01:18 2015 +0000"
      },
      "message": "Merge \"libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.\" into klp-dev"
    },
    {
      "commit": "937c6bedd4b6e5c6cb29a238eb459047dedd3486",
      "tree": "de9072b197da1e8b0e7ebe6a0ea2f162237d191d",
      "parents": [
        "916a9684295fb578f4b3c6c16b621ef201a49964"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Aug 18 14:32:16 2015 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Aug 20 03:53:44 2015 +0000"
      },
      "message": "libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.\n\nBug: 23270724\nChange-Id: Id7ba55c7bf6860fbfc892bbb6378aac644c82da4\n(cherry picked from commit c51ab7dd82bf4e24666fc72a55e03e2f530204d5)\n"
    },
    {
      "commit": "b2ae4351539de9aa4667fcb3e02ba40d9c6bd094",
      "tree": "aa8ac42170bb5e669d625f7bc351327780feda61",
      "parents": [
        "916a9684295fb578f4b3c6c16b621ef201a49964"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed Aug 19 17:31:51 2015 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Aug 20 03:36:58 2015 +0000"
      },
      "message": "libstagefright: fix overflow in pvdec_api.cpp.\n\nBug: 20674086\nChange-Id: Ie2c711865c3b92f3fa2f3c7a436fa0e3687eb8b3\n(cherry picked from commit d7bb1cd786e5ea4ac61119cc1a08082474f7787b)\n"
    }
  ],
  "next": "4d46f6f18f5160b8992ec1e66ef1844212fc7d48"
}