)]}'
{
  "log": [
    {
      "commit": "ee7a5ef61b8d1149811ee73c80aca2ac8474d559",
      "tree": "7aac6e85dfe15db1d0e9f88f468ad87b3bc0e9bc",
      "parents": [
        "c6b8225e759d1790d9a38082a18ce7e24a3dba27",
        "b4eacebfc5c5fd86b20661eab0797ce70c66e323"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@android.com",
        "time": "Thu May 01 19:34:56 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu May 01 19:34:56 2014 +0000"
      },
      "message": "am b4eacebf: am 1afedc4d: am 6eafba6b: Merge \"Temporary workaround for log spam\"\n\n* commit \u0027b4eacebfc5c5fd86b20661eab0797ce70c66e323\u0027:\n  Temporary workaround for log spam\n"
    },
    {
      "commit": "b4eacebfc5c5fd86b20661eab0797ce70c66e323",
      "tree": "5137b2fffa0990b6658d184709b8c3a6739859e0",
      "parents": [
        "3c782246d5ee9869f2167a00df748eac1b9e9153",
        "1afedc4d99acd52f99221d71b3a372a0a5497a84"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@android.com",
        "time": "Thu May 01 19:31:31 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu May 01 19:31:31 2014 +0000"
      },
      "message": "am 1afedc4d: am 6eafba6b: Merge \"Temporary workaround for log spam\"\n\n* commit \u00271afedc4d99acd52f99221d71b3a372a0a5497a84\u0027:\n  Temporary workaround for log spam\n"
    },
    {
      "commit": "1afedc4d99acd52f99221d71b3a372a0a5497a84",
      "tree": "8273a226bb67ae2cababe2168229c9c562fc363d",
      "parents": [
        "b1d2b51c4652ecdea907a5a6865d55a9bc52c6a2",
        "6eafba6bba3a4949cf3807ea39d5c1e969bebc52"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@android.com",
        "time": "Thu May 01 19:29:25 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu May 01 19:29:25 2014 +0000"
      },
      "message": "am 6eafba6b: Merge \"Temporary workaround for log spam\"\n\n* commit \u00276eafba6bba3a4949cf3807ea39d5c1e969bebc52\u0027:\n  Temporary workaround for log spam\n"
    },
    {
      "commit": "83f052a749b8e0ee5df3467d8332d6140fcafb50",
      "tree": "f8630843814f437806c13a803315cce3f49ce2a0",
      "parents": [
        "416685d0cbab40bfc48b0e787206b5d5c2e2ec25"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@android.com",
        "time": "Thu May 01 10:41:11 2014 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@android.com",
        "time": "Thu May 01 11:49:00 2014 -0700"
      },
      "message": "Temporary workaround for log spam\n\nBug: 13790505\nChange-Id: Icfc403bceaefdede1af65dfd70ba3e8b26abab02\n"
    },
    {
      "commit": "d1adad7acdff96f6518935214d93a655cc447570",
      "tree": "36e22d8950d9ab5ca4862e6d230780e2355f50a6",
      "parents": [
        "029a64e0327ecc1215a3d17ce50f508edae1c4a6",
        "0d79b935f533220613f492ab06a12f5cc9591805"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Apr 30 15:53:01 2014 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Apr 30 15:53:01 2014 -0700"
      },
      "message": "resolved conflicts for merge of 0d79b935 to master\n\nChange-Id: If6de8c1b1d7707918e2a60ea8583749e0127edb8\n"
    },
    {
      "commit": "029a64e0327ecc1215a3d17ce50f508edae1c4a6",
      "tree": "4c99a37fb8eb563cd55240cba177edc06a45ac7c",
      "parents": [
        "32fa3c6fab55b075c916f4dad38e42e239bb7813"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Apr 15 09:58:55 2014 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Apr 30 13:49:03 2014 -0700"
      },
      "message": "Define CHANNEL_MASK_* in terms of AUDIO_CHANNEL_OUT_*\n\nand use same suffixes\n\nChange-Id: I90b74ede171ba2550db4a220cfd1ad2e3caefe2d\n"
    },
    {
      "commit": "0d79b935f533220613f492ab06a12f5cc9591805",
      "tree": "ea60cbcafa121bc3956de87a94ddc52f05e36da0",
      "parents": [
        "f612af07efe1b71903a2e3e0c4f6e38fa59a30c5",
        "b27ce2fba0049897558f1f3df9039f443ee4bc88"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@android.com",
        "time": "Wed Apr 30 19:00:21 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Apr 30 19:00:21 2014 +0000"
      },
      "message": "am b27ce2fb: am 416685d0: Merge \"Fix format warnings\"\n\n* commit \u0027b27ce2fba0049897558f1f3df9039f443ee4bc88\u0027:\n  Fix format warnings\n"
    },
    {
      "commit": "b27ce2fba0049897558f1f3df9039f443ee4bc88",
      "tree": "220cb28b88ef3280ba1621193458c2ca95f69b7e",
      "parents": [
        "1a7be1ec9c769203e6c8e26378de0ab8e2ad493d",
        "416685d0cbab40bfc48b0e787206b5d5c2e2ec25"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@android.com",
        "time": "Wed Apr 30 18:56:54 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Apr 30 18:56:54 2014 +0000"
      },
      "message": "am 416685d0: Merge \"Fix format warnings\"\n\n* commit \u0027416685d0cbab40bfc48b0e787206b5d5c2e2ec25\u0027:\n  Fix format warnings\n"
    },
    {
      "commit": "32fa3c6fab55b075c916f4dad38e42e239bb7813",
      "tree": "afcf4bf640ea8ad973e2e613d4d5fee2e21377d3",
      "parents": [
        "bff804655bcc8e94c48e8da170b9381e9aab7980"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Apr 29 09:01:52 2014 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Apr 30 09:34:02 2014 -0700"
      },
      "message": "Remove AUDIO_CHANNEL_OUT_SURROUND\n\nand corresponding downmix effect\n\nChange-Id: I1576aa373ca7acbb84d7742bacbd9c2da04a7a4c\n"
    },
    {
      "commit": "1a7be1ec9c769203e6c8e26378de0ab8e2ad493d",
      "tree": "68773b199cc4adcb96124270863244477570c78e",
      "parents": [
        "f131f87369ec06fc27fc1f14ea72f0ca1a066509",
        "91820d46b5f3065c2fded3cdf65d305715b33bb1"
      ],
      "author": {
        "name": "Bill Yi",
        "email": "byi@google.com",
        "time": "Tue Apr 29 11:34:16 2014 -0700"
      },
      "committer": {
        "name": "Bill Yi",
        "email": "byi@google.com",
        "time": "Tue Apr 29 11:34:16 2014 -0700"
      },
      "message": "Merge commit \u002791820d46b5f3065c2fded3cdf65d305715b33bb1\u0027 into HEAD\n"
    },
    {
      "commit": "6643b3d878d674dd5be4b589d63dc3e6fc94df72",
      "tree": "b58ef8e63bb7fa6793244fe136d90926e1040a00",
      "parents": [
        "7e5c635114a7762ad44581300021667a0da97389",
        "f131f87369ec06fc27fc1f14ea72f0ca1a066509"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Mon Apr 28 22:49:34 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Apr 28 22:49:34 2014 +0000"
      },
      "message": "am f131f873: Merge \"Add private method NBLog::Reader::dumpLine()\"\n\n* commit \u0027f131f87369ec06fc27fc1f14ea72f0ca1a066509\u0027:\n  Add private method NBLog::Reader::dumpLine()\n"
    },
    {
      "commit": "7aeb4b5b08aa31b8bcdebe43e9f56169b7a3b03e",
      "tree": "5e6fc9cd53668efe8a4f43ab1d0827a868bab56c",
      "parents": [
        "15387a6e8e7930ea80f46c98fab54f22981e7f11",
        "5cda1b30b8c3900f8405f9bf2fab2df6e38ea95f"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Mon Apr 28 22:31:50 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Apr 28 22:31:51 2014 +0000"
      },
      "message": "Merge \"PlaylistFetcher: clear mTSParser on bad starting seq # hint\""
    },
    {
      "commit": "95d287db3aa5c93533d8e4a723e24f33ea29ffa0",
      "tree": "43fd98048b3dd5924b3836bdb429f05d72397a2f",
      "parents": [
        "92dfd8e67e099577d07eaeb28aad533fd5514d8a"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@android.com",
        "time": "Mon Apr 28 14:11:45 2014 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@android.com",
        "time": "Mon Apr 28 14:11:45 2014 -0700"
      },
      "message": "Fix format warnings\n\nChange-Id: Id7aded4287cc8d5387a20389d3ef6220d67d1d88\n"
    },
    {
      "commit": "92dfd8e67e099577d07eaeb28aad533fd5514d8a",
      "tree": "c2df92dbe30769db409737fd29fdb96b4546fa17",
      "parents": [
        "4513aa2cda9e636e4ac675dab9a1353b22e951ae"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Jul 11 14:29:59 2013 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@android.com",
        "time": "Mon Apr 28 14:10:21 2014 -0700"
      },
      "message": "Add private method NBLog::Reader::dumpLine()\n\nThis allows us to abstract out fdprintf vs ALOGI\nso that callers don\u0027t need an \u0027if\u0027 at every location.\n\nChange-Id: I4c68185fc19f32caeaed93347e6b7d09b8d4c4d8\n"
    },
    {
      "commit": "5cda1b30b8c3900f8405f9bf2fab2df6e38ea95f",
      "tree": "57d66eff83abeda1cedd515b9f79e0fd40213f02",
      "parents": [
        "ce65a05eddc8a39d9805d1e1eee0292725df1f1c"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Wed Apr 23 17:07:21 2014 -0700"
      },
      "committer": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Fri Apr 25 18:06:20 2014 -0700"
      },
      "message": "PlaylistFetcher: clear mTSParser on bad starting seq # hint\n\nBug: 14159556\nChange-Id: If25187477066282d5980da3c4d8a76dcfcf54d27\n"
    },
    {
      "commit": "15387a6e8e7930ea80f46c98fab54f22981e7f11",
      "tree": "1868b13c6841f7b3433445f597b13a3990e68c95",
      "parents": [
        "67ee990d324229ab0565ce632bd5a04297e16a01"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Thu Apr 17 11:16:05 2014 -0700"
      },
      "committer": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Fri Apr 25 14:14:39 2014 -0700"
      },
      "message": "AwesomePlayer: fixed division by zero in onBufferingUpdate\n\nBug: 13911283\nChange-Id: I968a274634a86f5c46f75dc533024dad44afc36b\n"
    },
    {
      "commit": "67ee990d324229ab0565ce632bd5a04297e16a01",
      "tree": "478c3da29731bb317acdf64a203d80c80ad820df",
      "parents": [
        "e273141263e988ab086a8d41e0e4fc75c00f1b86",
        "4154795d5526750b7aec5f774831a9e1ba0a3f15"
      ],
      "author": {
        "name": "Alex Glaznev",
        "email": "glaznev@google.com",
        "time": "Thu Apr 24 21:54:08 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Apr 24 21:54:08 2014 +0000"
      },
      "message": "Merge \"Support VP8 encoder key frame interval and number of temporal layers configuration.\""
    },
    {
      "commit": "4154795d5526750b7aec5f774831a9e1ba0a3f15",
      "tree": "94e56c4fbcbe4e4f0665c2721cba4fa9cbd7945c",
      "parents": [
        "2f8a36fc8df14cba33fa7c5c1c9d5a52f8a133c2"
      ],
      "author": {
        "name": "Alex Glaznev",
        "email": "glaznev@google.com",
        "time": "Thu Mar 20 17:32:57 2014 -0700"
      },
      "committer": {
        "name": "Alex Glaznev",
        "email": "glaznev@google.com",
        "time": "Thu Apr 24 14:25:23 2014 -0700"
      },
      "message": "Support VP8 encoder key frame interval and number of\ntemporal layers configuration.\n\n- Change ACodec.cpp to populate VP8 extra parameters\nstructure with key frame interval, number of temporal\nlayers and quantization parameters.\n\n- Change software VP8 encoder to select frame temporal\npatterns and temporal layers bitrate distribution based\non the number of layers similar to patterns used in WebRTC.\n\n- Calculate video frame duration in VP8 encoder from the\ntimestamps.\n\nBug: 11969958\nChange-Id: Ia96054d886cd09d8c108dfe250fc5f4478eaa042\n"
    },
    {
      "commit": "18e846c1ca29d7c4e4607243bc5ba694385128a1",
      "tree": "8f2171a559e608329fde8bd8000ec469b79db288",
      "parents": [
        "9e8eeafe1ea0e88d548270280bcc209dde51781b",
        "474038aef32f47d080567e8519d916b069a4f707"
      ],
      "author": {
        "name": "Nick Kralevich",
        "email": "nnk@google.com",
        "time": "Mon Apr 21 20:32:02 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Apr 21 20:32:02 2014 +0000"
      },
      "message": "am 474038ae: am 27158eb5: Merge \"AArch64: AString::append for longs and pointers\"\n\n* commit \u0027474038aef32f47d080567e8519d916b069a4f707\u0027:\n  AArch64: AString::append for longs and pointers\n"
    },
    {
      "commit": "474038aef32f47d080567e8519d916b069a4f707",
      "tree": "1a8a7cb37139ea602f527e56196c9bf18f728157",
      "parents": [
        "e1ff1051ffee8fb650741ad133f0f28b73eb7a73",
        "27158eb55de8150258faba6574fc51c7aa641516"
      ],
      "author": {
        "name": "Nick Kralevich",
        "email": "nnk@google.com",
        "time": "Mon Apr 21 20:28:58 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Apr 21 20:28:58 2014 +0000"
      },
      "message": "am 27158eb5: Merge \"AArch64: AString::append for longs and pointers\"\n\n* commit \u002727158eb55de8150258faba6574fc51c7aa641516\u0027:\n  AArch64: AString::append for longs and pointers\n"
    },
    {
      "commit": "27158eb55de8150258faba6574fc51c7aa641516",
      "tree": "3ec5f60f35728d4e2a25d2f19b863fbb1aa41605",
      "parents": [
        "e0f20cea4a40deaabd2b409ab301f6fd7b2e8e7f",
        "ef80764db37aa00bbb88755cb6cf11c6f2720bd3"
      ],
      "author": {
        "name": "Nick Kralevich",
        "email": "nnk@google.com",
        "time": "Mon Apr 21 20:21:42 2014 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Mon Apr 21 20:21:43 2014 +0000"
      },
      "message": "Merge \"AArch64: AString::append for longs and pointers\""
    },
    {
      "commit": "9e8eeafe1ea0e88d548270280bcc209dde51781b",
      "tree": "26aac822426da9880168702c8988f3cbe80d0dd0",
      "parents": [
        "6adc9ccb2948d9421a0ed4b74f52b909bcec2037",
        "2475264264b51a7592c5b2e4cd6cfdaddba16644"
      ],
      "author": {
        "name": "Dan Stoza",
        "email": "stoza@google.com",
        "time": "Mon Apr 21 16:11:20 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Apr 21 16:11:20 2014 +0000"
      },
      "message": "Merge \"BufferQueue: Increase max slots from 32 to 64\""
    },
    {
      "commit": "cb010a3fa85db1eb90346b35e484e21e7f1b1a4b",
      "tree": "720906051414d27dfca82c175618a83190d9ea3d",
      "parents": [
        "77d4f613bbed8b646c8ddade6a0737fcbd391b07",
        "e1ff1051ffee8fb650741ad133f0f28b73eb7a73"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 18 22:11:00 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Apr 18 22:11:00 2014 +0000"
      },
      "message": "am e1ff1051: am e0f20cea: Merge \"libeffects: 64 bit compile issues\"\n\n* commit \u0027e1ff1051ffee8fb650741ad133f0f28b73eb7a73\u0027:\n  libeffects: 64 bit compile issues\n"
    },
    {
      "commit": "e1ff1051ffee8fb650741ad133f0f28b73eb7a73",
      "tree": "9a8cf94ee0f6ff3033cb4be2119ece5591220d0c",
      "parents": [
        "f5f24006f7bd997c6bca00804ec0f35bddd7ccc2",
        "e0f20cea4a40deaabd2b409ab301f6fd7b2e8e7f"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 18 22:09:04 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Apr 18 22:09:04 2014 +0000"
      },
      "message": "am e0f20cea: Merge \"libeffects: 64 bit compile issues\"\n\n* commit \u0027e0f20cea4a40deaabd2b409ab301f6fd7b2e8e7f\u0027:\n  libeffects: 64 bit compile issues\n"
    },
    {
      "commit": "7cb0e733210c2ce7dd2a7c9d32f6d83c4dab9656",
      "tree": "406ac589b6b1cf7efaef89723fd0b8de5e5e2b91",
      "parents": [
        "cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 18 13:48:25 2014 -0700"
      },
      "committer": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 18 13:57:58 2014 -0700"
      },
      "message": "libeffects: 64 bit compile issues\n\nChange-Id: I32dd13d307572fee91150f8e113df78924ca0067\n"
    },
    {
      "commit": "ce65a05eddc8a39d9805d1e1eee0292725df1f1c",
      "tree": "90485f0b968412906326e1248a5da0d6e025a003",
      "parents": [
        "1b24cf32e02a1372e57b3a2a432bc0adfe496e6d",
        "f5f24006f7bd997c6bca00804ec0f35bddd7ccc2"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Tue Apr 15 23:37:20 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Apr 15 23:37:20 2014 +0000"
      },
      "message": "am f5f24006: am cd4eb72e: Merge \"media: -Werror re-enabled\"\n\n* commit \u0027f5f24006f7bd997c6bca00804ec0f35bddd7ccc2\u0027:\n  media: -Werror re-enabled\n"
    },
    {
      "commit": "1b24cf32e02a1372e57b3a2a432bc0adfe496e6d",
      "tree": "220f4583ae1081df62fa5c861eed3e9e90a24515",
      "parents": [
        "4845b69f70ff457be8d8908f6eb61e2af67e00d3",
        "e80631aa1992ca50af679cd6a018c0ffda7f9b17"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Tue Apr 15 23:37:19 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Apr 15 23:37:19 2014 +0000"
      },
      "message": "am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d\n\n* commit \u0027e80631aa1992ca50af679cd6a018c0ffda7f9b17\u0027:\n  media: use size_t for integer iterator to Vector::size()\n  media: 64 bit compile issues\n"
    },
    {
      "commit": "f5f24006f7bd997c6bca00804ec0f35bddd7ccc2",
      "tree": "0b7338350bbe3e69c24a9d37b81166ad958d6de9",
      "parents": [
        "e80631aa1992ca50af679cd6a018c0ffda7f9b17",
        "cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Tue Apr 15 22:38:32 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Apr 15 22:38:32 2014 +0000"
      },
      "message": "am cd4eb72e: Merge \"media: -Werror re-enabled\"\n\n* commit \u0027cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed\u0027:\n  media: -Werror re-enabled\n"
    },
    {
      "commit": "e80631aa1992ca50af679cd6a018c0ffda7f9b17",
      "tree": "6b3fcc9fbb5b02976e4bb2163e994952303bead5",
      "parents": [
        "d4a3cae8cc4cf924925ae57723e61c89f6c4fd51",
        "839d11d1f7be9dff2f06c7d30a9eb39cb6782078"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Tue Apr 15 22:35:00 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Apr 15 22:35:00 2014 +0000"
      },
      "message": "am 839d11d1: Merge changes I0a744dc7,Id993a70d\n\n* commit \u0027839d11d1f7be9dff2f06c7d30a9eb39cb6782078\u0027:\n  media: use size_t for integer iterator to Vector::size()\n  media: 64 bit compile issues\n"
    },
    {
      "commit": "cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed",
      "tree": "32191d574c9a8ba8e66398ab375be118c37b3e86",
      "parents": [
        "839d11d1f7be9dff2f06c7d30a9eb39cb6782078",
        "3b5ec66c3623647fc4dfd1a446c4f25a2c7f1ba0"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Tue Apr 15 22:31:39 2014 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue Apr 15 22:31:39 2014 +0000"
      },
      "message": "Merge \"media: -Werror re-enabled\""
    },
    {
      "commit": "3ab368e0810d894dcbc0971350c095049478a055",
      "tree": "a50053c391da8c02797158395f2ecfec83218855",
      "parents": [
        "db43b34c3428e480f8c4c66e7e88f4001f37f91e"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Tue Apr 15 14:55:53 2014 -0700"
      },
      "committer": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Tue Apr 15 14:57:31 2014 -0700"
      },
      "message": "media: use size_t for integer iterator to Vector::size()\n\nChange-Id: I0a744dc7815a86a993df9b0623440be620ec8903\n"
    },
    {
      "commit": "db43b34c3428e480f8c4c66e7e88f4001f37f91e",
      "tree": "be194bf06c84b61f277a1c29c7499aa7862494a4",
      "parents": [
        "1df2557ac95a6d8a087fb15f6f842dc049f2759b"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 04 14:47:28 2014 -0700"
      },
      "committer": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Tue Apr 15 13:18:22 2014 -0700"
      },
      "message": "media: 64 bit compile issues\n\n- change internal sized types to use stdint.h\n- printf \u0026 scanf formats\n- size_t or unsigned int for iterators\n\nChange-Id: Id993a70d8bf54c667c5d652b34179a2c727ed446\n"
    },
    {
      "commit": "3b5ec66c3623647fc4dfd1a446c4f25a2c7f1ba0",
      "tree": "3958512f70c1b00e6bc43ba63fb8d9057cc87922",
      "parents": [
        "432ed3d66d09464778df31c73374ee897f7b8840"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Mon Apr 14 12:51:07 2014 -0700"
      },
      "committer": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Tue Apr 15 12:08:21 2014 -0700"
      },
      "message": "media: -Werror re-enabled\n\nChange-Id: I62fdb78e8acefafd468ce2e5aa9e78eba0dd0f48\n"
    },
    {
      "commit": "6bb7a89102a8966ee032d6ddc0b3ff4f1a47ef66",
      "tree": "3a163426164ba12d8395a895a21ebf43a72ac705",
      "parents": [
        "29fe1ea4b5a1d1fc1fb87b53866901357c04c5c1",
        "432ed3d66d09464778df31c73374ee897f7b8840"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Tue Apr 15 14:33:48 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Apr 15 14:33:48 2014 +0000"
      },
      "message": "am 432ed3d6: Merge \"libstagefright: fix 64-bit warnings\"\n\n* commit \u0027432ed3d66d09464778df31c73374ee897f7b8840\u0027:\n  libstagefright: fix 64-bit warnings\n"
    },
    {
      "commit": "ef80764db37aa00bbb88755cb6cf11c6f2720bd3",
      "tree": "2adc4fe23addd6229400624ecb760a44744b42d7",
      "parents": [
        "9829344d526f87ca745208f04216ec795b239581"
      ],
      "author": {
        "name": "Marcus Oakland",
        "email": "marcus.oakland@arm.com",
        "time": "Tue Mar 25 17:32:00 2014 +0000"
      },
      "committer": {
        "name": "Ashok Bhat",
        "email": "ashok.bhat@arm.com",
        "time": "Tue Apr 15 13:58:18 2014 +0100"
      },
      "message": "AArch64: AString::append for longs and pointers\n\nThe AString::append methods for long, unsigned long and void *\npointers were using char arrays of 16 elements, which were not long\nenough for 64-bit longs and pointers in __LP64__ systems. This\nresulted in \"FORTIFY_SOURCE: vsprintf: prevented write past end of\nbuffer. Calling abort().\" when the\nandroid.media.cts.DecoderTest#testFlush CTS test was run.\n\nThe AString::append methods that were using sprintf have been modifed\nto use snprintf instead, taking the sizeof the \"s\" array (which has\nbeen made 32 char without conditional compilation for __LP64__ where\nappropriate), and checking the return value to ensure that the string\nhas not been truncated.\n\nAfter this change and changes to the types of OMX_U32 and OMX_S32 in the\nframeworks/native/include/media/openmax/OMX_Types.h header file, the\nandroid.media.cts.DecoderTest#testFlush CTS test passes.\n\nChange-Id: I76d897373473c82f52986f43a15b050b844a370a\nSigned-off-by: Marcus Oakland \u003cmarcus.oakland@arm.com\u003e\n"
    },
    {
      "commit": "f6d0c1fd6d9e697bb3a891fae14c7e9d4b685de6",
      "tree": "7278734ca980774c0ec5b5d6baa30a8587136eb0",
      "parents": [
        "9829344d526f87ca745208f04216ec795b239581"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@google.com",
        "time": "Mon Apr 14 17:12:27 2014 -0700"
      },
      "committer": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Mon Apr 14 17:16:02 2014 -0700"
      },
      "message": "libstagefright: fix 64-bit warnings\n\n%lld -\u003e %\" PRId64 \" for int64_t\n%d -\u003e %zu for size_t\nAlso fixes some casts from void* to integer types, and some comparisons\nbetween signed and unsigned.\n\n(cherry picked from commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)\n\nChange-Id: I76ba94d0b67776fd7abdc83b43d47c61d6c32f4c\n"
    },
    {
      "commit": "210810b644a0bad76a04bfbff8a205f3b97b90ac",
      "tree": "398e5e6f9f988d0350b4637647620cc40183fbf2",
      "parents": [
        "27a17103f99d23157ac80ef7d75e25a3aae788bd",
        "29fe1ea4b5a1d1fc1fb87b53866901357c04c5c1"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Mon Apr 14 18:11:48 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Apr 14 18:11:48 2014 +0000"
      },
      "message": "am 29fe1ea4: am 9829344d: Merge \"media: memset sizeof argument issues\"\n\n* commit \u002729fe1ea4b5a1d1fc1fb87b53866901357c04c5c1\u0027:\n  media: memset sizeof argument issues\n"
    },
    {
      "commit": "29fe1ea4b5a1d1fc1fb87b53866901357c04c5c1",
      "tree": "815e0a3c1225770e29b6e72d7005737d1c9e398d",
      "parents": [
        "b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9",
        "9829344d526f87ca745208f04216ec795b239581"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Mon Apr 14 18:07:35 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Apr 14 18:07:35 2014 +0000"
      },
      "message": "am 9829344d: Merge \"media: memset sizeof argument issues\"\n\n* commit \u00279829344d526f87ca745208f04216ec795b239581\u0027:\n  media: memset sizeof argument issues\n"
    },
    {
      "commit": "9829344d526f87ca745208f04216ec795b239581",
      "tree": "84aef000929bcac9b87144e380e15587534f6e95",
      "parents": [
        "e523889332b88348e673137d272854278acbef8f",
        "d6579cc9f06052f94bf5a2c34261c84de0efce23"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Mon Apr 14 18:01:24 2014 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Mon Apr 14 18:01:24 2014 +0000"
      },
      "message": "Merge \"media: memset sizeof argument issues\""
    },
    {
      "commit": "2475264264b51a7592c5b2e4cd6cfdaddba16644",
      "tree": "c000c4327b6b305bcdc1b4883c32d36201eff049",
      "parents": [
        "430b61c72094882bc48693dfc10c256a6ae36ee9"
      ],
      "author": {
        "name": "Dan Stoza",
        "email": "stoza@google.com",
        "time": "Wed Apr 09 16:10:53 2014 -0700"
      },
      "committer": {
        "name": "Dan Stoza",
        "email": "stoza@google.com",
        "time": "Fri Apr 11 15:13:02 2014 -0700"
      },
      "message": "BufferQueue: Increase max slots from 32 to 64\n\nIncreases NUM_BUFFER_SLOTS from 32 to 64 and changes the mask\nreturned by IGBC::getReleasedBuffers from 32 to 64 bits.\n\nBug: 13174352\nChange-Id: I1c41256ffbc30abcf9f7b0b5fcf53da40462da28\n"
    },
    {
      "commit": "8e1554f35ffcc0f7ac833a796adf3926371fcb76",
      "tree": "16a15b50c6cc47a120ccae11a8bc8fbd2a9d3ae6",
      "parents": [
        "0f37620e0f79bfab1354e2e3049c260342a2637e",
        "b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 22:05:19 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Apr 11 22:05:19 2014 +0000"
      },
      "message": "am b1b1e303: am e5238893: Merge \"Fix aosp_arm64 mirror-aosp-master build 1119326\"\n\n* commit \u0027b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9\u0027:\n  Fix aosp_arm64 mirror-aosp-master build 1119326\n"
    },
    {
      "commit": "b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9",
      "tree": "bc494022de5859e096092d63aaffceed5cc2b018",
      "parents": [
        "a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50",
        "e523889332b88348e673137d272854278acbef8f"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 22:03:28 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Apr 11 22:03:28 2014 +0000"
      },
      "message": "am e5238893: Merge \"Fix aosp_arm64 mirror-aosp-master build 1119326\"\n\n* commit \u0027e523889332b88348e673137d272854278acbef8f\u0027:\n  Fix aosp_arm64 mirror-aosp-master build 1119326\n"
    },
    {
      "commit": "4850983c3a9131af32d0fe61dd9ce3d1e5d735b5",
      "tree": "82f9fd986b28db58f18f80e9e2033a8e1fe48be6",
      "parents": [
        "a133bc87eb8269a6fa61772cb708f10c9c3b7a87"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 14:29:37 2014 -0700"
      },
      "committer": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 14:54:52 2014 -0700"
      },
      "message": "Fix aosp_arm64 mirror-aosp-master build 1119326\n\nRemove -Werror that was set in \u0027warnings be gone\u0027\n\nChange-Id: I2379dc56f04a6d0ac50f90e6d1cdf05fce3a5c30\n"
    },
    {
      "commit": "0f37620e0f79bfab1354e2e3049c260342a2637e",
      "tree": "9d0e7165f522972b5359d5a2b63928eef376e97f",
      "parents": [
        "027eadebbf7534d3eb596451c9197571f4e94073"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Fri Apr 11 11:54:52 2014 -0700"
      },
      "committer": {
        "name": "Colin Cross",
        "email": "ccross@google.com",
        "time": "Fri Apr 11 18:56:48 2014 +0000"
      },
      "message": "Revert \"build fix for aosp-idea133 @ 1119318\"\n\nBuild fix is needed in AOSP, but in master it re-introduces a warning\nand breaks the build on -Werror.  Revert it in master.\n\nThis reverts commit effbb3a9b72050dbe150af7302d9148fe7e927d3."
    },
    {
      "commit": "027eadebbf7534d3eb596451c9197571f4e94073",
      "tree": "218d2dc358ba7384964d6faf1483eb9d39b1d738",
      "parents": [
        "dac1d3963e271f7ab4218d0a86545a23faa087dd",
        "a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 18:33:10 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Apr 11 18:33:10 2014 +0000"
      },
      "message": "am a7281ee1: am a133bc87: Merge \"build fix for aosp-idea133 @ 1119318\"\n\n* commit \u0027a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50\u0027:\n  build fix for aosp-idea133 @ 1119318\n"
    },
    {
      "commit": "a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50",
      "tree": "7d8d98145355348aac0c2ce200047368b7b0c95a",
      "parents": [
        "4cd0d582379ca9decba7ee0b99010d9a39f298de",
        "a133bc87eb8269a6fa61772cb708f10c9c3b7a87"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 18:30:00 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Apr 11 18:30:00 2014 +0000"
      },
      "message": "am a133bc87: Merge \"build fix for aosp-idea133 @ 1119318\"\n\n* commit \u0027a133bc87eb8269a6fa61772cb708f10c9c3b7a87\u0027:\n  build fix for aosp-idea133 @ 1119318\n"
    },
    {
      "commit": "4cd0d582379ca9decba7ee0b99010d9a39f298de",
      "tree": "96a869d3d4f9b51a0bce75ffffbdf810089d0425",
      "parents": [
        "8819b515f541daea4288a87cfbae37561cb80b13",
        "0938c6f7a1e713030b04e32548012f0c29c94f4d"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 18:26:28 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Apr 11 18:26:28 2014 +0000"
      },
      "message": "am 0938c6f7: Merge \"warnings be gone (4/4)\"\n\n* commit \u00270938c6f7a1e713030b04e32548012f0c29c94f4d\u0027:\n  warnings be gone (4/4)\n"
    },
    {
      "commit": "8819b515f541daea4288a87cfbae37561cb80b13",
      "tree": "ae3eace6dbcb6c0d0663d77bc61283e2156d9091",
      "parents": [
        "355c04dfe84b06311bdb15a1617e22bea4eb2571",
        "2a27a640d0d9747659cc609b4384ffead090866e"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 18:26:27 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Apr 11 18:26:27 2014 +0000"
      },
      "message": "am 2a27a640: Merge \"warnings be gone (3/4)\"\n\n* commit \u00272a27a640d0d9747659cc609b4384ffead090866e\u0027:\n  warnings be gone (3/4)\n"
    },
    {
      "commit": "355c04dfe84b06311bdb15a1617e22bea4eb2571",
      "tree": "17094420fcab88bdbe28583b8121f92c810a6462",
      "parents": [
        "dd01ce9c28e37d4556606f481faeec032a1fe04e",
        "797248568b5ba32606ac0d8de024190e3cc95973"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 18:26:26 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Apr 11 18:26:26 2014 +0000"
      },
      "message": "am 79724856: Merge \"warnings be gone (2/4)\"\n\n* commit \u0027797248568b5ba32606ac0d8de024190e3cc95973\u0027:\n  warnings be gone (2/4)\n"
    },
    {
      "commit": "d6579cc9f06052f94bf5a2c34261c84de0efce23",
      "tree": "19a65464efb5c70b2e656053f53a1d0db5039ac9",
      "parents": [
        "a133bc87eb8269a6fa61772cb708f10c9c3b7a87"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Thu Apr 10 09:37:52 2014 -0700"
      },
      "committer": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 11:25:19 2014 -0700"
      },
      "message": "media: memset sizeof argument issues\n\nChange-Id: I37ef154eea0f77fb7f22faf6891f3025f6ff346e\n"
    },
    {
      "commit": "a133bc87eb8269a6fa61772cb708f10c9c3b7a87",
      "tree": "90e860a944b0dd22e95146f5bbae79e3f18b33a0",
      "parents": [
        "0938c6f7a1e713030b04e32548012f0c29c94f4d",
        "effbb3a9b72050dbe150af7302d9148fe7e927d3"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 18:24:17 2014 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Fri Apr 11 18:24:17 2014 +0000"
      },
      "message": "Merge \"build fix for aosp-idea133 @ 1119318\""
    },
    {
      "commit": "bc64e09a65bd5ba97706d2420449b9710c9e9c01",
      "tree": "b0b4122174721e31b1be7b39bfc9d24a00cf5265",
      "parents": [
        "2a27a640d0d9747659cc609b4384ffead090866e"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 09:50:45 2014 -0700"
      },
      "committer": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 18:20:54 2014 +0000"
      },
      "message": "warnings be gone (4/4)\n\n(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)\n(squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)\n\nChange-Id: I55df09714a0e1cb98a44c8fcddac2c646ae5e139"
    },
    {
      "commit": "51b9eb1c330d23b98ddb629200cd177bc9c39def",
      "tree": "2bfacc25072276b6d6d60aa5bbd0b34a708c78a5",
      "parents": [
        "797248568b5ba32606ac0d8de024190e3cc95973"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 09:49:23 2014 -0700"
      },
      "committer": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 18:20:27 2014 +0000"
      },
      "message": "warnings be gone (3/4)\n\n(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)\n(squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)\n\nChange-Id: I0c5a0c3ea32bb5091d90c7391c67edd02e50397f"
    },
    {
      "commit": "3f37c83d9817cacc0965ca66873b0353fac07228",
      "tree": "068991ca962780f139d0e752980f728324fdae5f",
      "parents": [
        "52a861d2825544fe2eb90f8e5f6351d02ff95536"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 09:47:30 2014 -0700"
      },
      "committer": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 18:19:51 2014 +0000"
      },
      "message": "warnings be gone (2/4)\n\n(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)\n(squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)\n\nChange-Id: I048a2c6868515716c7cd7319a3d0abe6311dac4e"
    },
    {
      "commit": "effbb3a9b72050dbe150af7302d9148fe7e927d3",
      "tree": "29d9f0e663e597b07bd0807e9e6db40dbf64cc8d",
      "parents": [
        "52a861d2825544fe2eb90f8e5f6351d02ff95536"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 11:01:18 2014 -0700"
      },
      "committer": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 11:01:18 2014 -0700"
      },
      "message": "build fix for aosp-idea133 @ 1119318\n\nChange-Id: I34084ebb48318628d46c2ff7ca567bd7638619e4\n"
    },
    {
      "commit": "dd01ce9c28e37d4556606f481faeec032a1fe04e",
      "tree": "9d15e20598193a7c4ab3d90beb5f8405c8d27a6f",
      "parents": [
        "52a23bd3f8ace9f3a6295fc2d2b97e64665d77d8",
        "52a861d2825544fe2eb90f8e5f6351d02ff95536"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 17:26:28 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Apr 11 17:26:28 2014 +0000"
      },
      "message": "am 52a861d2: Merge \"warnings be gone.\"\n\n* commit \u002752a861d2825544fe2eb90f8e5f6351d02ff95536\u0027:\n  warnings be gone.\n"
    },
    {
      "commit": "d411b4ca2945cd8974a3a78199fce94646950128",
      "tree": "e1c9e21525348fe826b91ecee7075ccb743f843d",
      "parents": [
        "51b3ea2b8f7298bffbd246c65a606cd053357b66"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Fri Apr 11 07:54:53 2014 -0700"
      },
      "committer": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Fri Apr 11 17:12:03 2014 +0000"
      },
      "message": "warnings be gone.\n\n(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)\n\nModified by Mark Salyzyn \u003csalyzyn@google.com\u003e to keep merge conflicts\nor errors downstream to a minimum.\n\nChange-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613"
    },
    {
      "commit": "c51db0a6bfb71ea9c934fb7971cb5ae1f1cf03a0",
      "tree": "82b7ebba818ae83a363cd6ca692d69af5a2be235",
      "parents": [
        "a1df816c0677185534babba6ffc29970b048e52e"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Apr 02 07:35:29 2014 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Apr 04 19:05:32 2014 -0700"
      },
      "message": "stagefright: handle corrupt matroska files gracefully\n\nBug: 13693438\nBug: 13744158\nChange-Id: I557595b5b5d4a20934f79e00a622b06d13378223\n"
    },
    {
      "commit": "a1df816c0677185534babba6ffc29970b048e52e",
      "tree": "a2bf0a6954b805b7eef330387940067fb132da4f",
      "parents": [
        "bcf08569453dcb42730cda3230d5d375a697005b"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Apr 03 19:13:01 2014 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Apr 04 19:05:32 2014 -0700"
      },
      "message": "stagefright: log uri protocols, and opt-in to log full uri\n\nAdded property media.stagefright.log-uri.  Set it to true or 1 to\nlog uris by AwesomePlayer.\n\nAdded utility function to get uri debug string based on incognito\nand log opt-in status.\n\nChange-Id: I5ccc23079ddfb120dd9703a3ed651a162ed5acec\nRelated-Bug: 6994761\n"
    },
    {
      "commit": "bcf08569453dcb42730cda3230d5d375a697005b",
      "tree": "ff00c7b04e75cf242d1a48096e1cf9a960f698e9",
      "parents": [
        "cffcba5681be302b1c1b40747a1305f2c2a667c3"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Apr 04 18:09:35 2014 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Apr 04 19:05:32 2014 -0700"
      },
      "message": "stagefright: add AString constructor from String8\n\nChange-Id: I85b37b6dee4ea9d5f7f1c1a40ff405a01a0c67f1\n"
    },
    {
      "commit": "cffcba5681be302b1c1b40747a1305f2c2a667c3",
      "tree": "07d2bf1b8ccdd3d32f1ec9785a42e26593c7ddf5",
      "parents": [
        "619fd4d6d4d815065becbdf360422ee40dfa7690",
        "5205977929c8a63d3bba026c6bd7b4cc1e236627"
      ],
      "author": {
        "name": "Dan Stoza",
        "email": "stoza@google.com",
        "time": "Fri Apr 04 17:36:04 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Apr 04 17:36:04 2014 +0000"
      },
      "message": "Merge \"Remove deprecated BufferQueue constructor\""
    },
    {
      "commit": "619fd4d6d4d815065becbdf360422ee40dfa7690",
      "tree": "1722d64e9bafe4c28f50b18dd9d4aa2cf025ca75",
      "parents": [
        "0a8be80261d61e29ab4a99720e68879ae7bc3c0e",
        "52a23bd3f8ace9f3a6295fc2d2b97e64665d77d8"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Apr 03 10:20:09 2014 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Apr 03 10:20:09 2014 -0700"
      },
      "message": "Merge commit \u002752a23bd3\u0027 into manualmerge\n\nChange-Id: I7a6105f467a2fa3631c62be3d306845e9cf9b365\n"
    },
    {
      "commit": "52a23bd3f8ace9f3a6295fc2d2b97e64665d77d8",
      "tree": "9c3f023eaffaea5a6af70438c30a4f1158e1211a",
      "parents": [
        "8260bf63e2fa974b524029f170d9ad17b69b884f",
        "51b3ea2b8f7298bffbd246c65a606cd053357b66"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Apr 03 17:11:25 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Apr 03 17:11:25 2014 +0000"
      },
      "message": "am 51b3ea2b: Merge \"64-bit: Correction to OMX_U32 and OMX_S32\"\n\n* commit \u002751b3ea2b8f7298bffbd246c65a606cd053357b66\u0027:\n  64-bit: Correction to OMX_U32 and OMX_S32\n"
    },
    {
      "commit": "8260bf63e2fa974b524029f170d9ad17b69b884f",
      "tree": "4902780df01f296a568f4c06d4be923e5a14575e",
      "parents": [
        "d009aa2bac4a4c8ca2e0c1203148194e237cc5d0",
        "93bbc8343133b910aeae536617efce978040bbae"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@android.com",
        "time": "Thu Apr 03 15:09:26 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Apr 03 15:09:26 2014 +0000"
      },
      "message": "am 93bbc834: Merge \"Fix aac decoder flush\"\n\n* commit \u002793bbc8343133b910aeae536617efce978040bbae\u0027:\n  Fix aac decoder flush\n"
    },
    {
      "commit": "638986a78c94081cded0cd87dc9d3b31965092a4",
      "tree": "44113f9b32efc0a8aa09edf4178ff9aab7204386",
      "parents": [
        "6b66a33d399bf2e5b5c555d22c39a9543839827a",
        "d009aa2bac4a4c8ca2e0c1203148194e237cc5d0"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Thu Apr 03 08:31:22 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Apr 03 08:31:22 2014 +0000"
      },
      "message": "am d009aa2b: am 81e0bd44: Add signature|system permission to MediaDrm signer APIs\n\n* commit \u0027d009aa2bac4a4c8ca2e0c1203148194e237cc5d0\u0027:\n  Add signature|system permission to MediaDrm signer APIs\n"
    },
    {
      "commit": "d009aa2bac4a4c8ca2e0c1203148194e237cc5d0",
      "tree": "ccb0affb48caf578a223cbd6d2fd1a869f2c560e",
      "parents": [
        "54654025d656b437eeb5c5c9267104625bcc496d",
        "81e0bd44a10e90778ab5b0a3babd4fc52cadedd8"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Thu Apr 03 01:35:29 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Apr 03 01:35:29 2014 +0000"
      },
      "message": "am 81e0bd44: Add signature|system permission to MediaDrm signer APIs\n\n* commit \u002781e0bd44a10e90778ab5b0a3babd4fc52cadedd8\u0027:\n  Add signature|system permission to MediaDrm signer APIs\n"
    },
    {
      "commit": "81e0bd44a10e90778ab5b0a3babd4fc52cadedd8",
      "tree": "e593e5db634c29de4c9351d9a5f64f2f2e49d503",
      "parents": [
        "68d9d71a792deed75d32fe13febc07c9c12c8449"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Wed Apr 02 16:41:38 2014 -0700"
      },
      "committer": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Wed Apr 02 16:41:38 2014 -0700"
      },
      "message": "Add signature|system permission to MediaDrm signer APIs\n\nChange-Id: If970e5ff8dcab2e67af2f3376dcd14dca82f2394\nrelated-to-bug: 12702350\n"
    },
    {
      "commit": "54654025d656b437eeb5c5c9267104625bcc496d",
      "tree": "422e98b7e2e2a8156c6b0a6d490f586a2405e671",
      "parents": [
        "f356a123bf966150965a1af1cb9bd6ff2ca020de",
        "2b2fbe299163b544668b41f594943a19b78dafd3"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@android.com",
        "time": "Wed Apr 02 21:48:01 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Apr 02 21:48:01 2014 +0000"
      },
      "message": "am 2b2fbe29: Merge \"Fix decoder EOS handling\"\n\n* commit \u00272b2fbe299163b544668b41f594943a19b78dafd3\u0027:\n  Fix decoder EOS handling\n"
    },
    {
      "commit": "4cc0bedb859f9773f54f844cca4ce806c86bb6f8",
      "tree": "918f5f7b9a78a8f2fee4c6184c0fdec4ac40ccb5",
      "parents": [
        "99021c47f45ee8bf3317cff7d08226e76c8d8227",
        "54b0bc74e051bd7df10cd657b481d88db6cdaa27"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Apr 02 21:36:57 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Apr 02 21:36:58 2014 +0000"
      },
      "message": "Merge \"ACodec: do not signal kWhatShutdownCompleted on codec error\""
    },
    {
      "commit": "66fe2e9ee30bcb4161bc487ec63d2ae4a05f4051",
      "tree": "4f996c27cafd9ef29e45ba1f3acb05210fbd16e6",
      "parents": [
        "08fce45fdb537e135868604522aba15461f516be"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Apr 02 10:25:35 2014 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@android.com",
        "time": "Wed Apr 02 11:45:51 2014 -0700"
      },
      "message": "64-bit: Correction to OMX_U32 and OMX_S32\n\nChange-Id: I9c41bb34c35595ac19a7ab8faaacde8cb4fa9a15\n"
    },
    {
      "commit": "08fce45fdb537e135868604522aba15461f516be",
      "tree": "0645a0440cbb2f4bda446d3e073916c82d30e033",
      "parents": [
        "c71a99131ca97bd3bdc5b78473d06e613e96e073"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Sep 20 07:18:21 2013 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@android.com",
        "time": "Wed Apr 02 11:41:14 2014 -0700"
      },
      "message": "Fix aac decoder flush\n\nb/8543366\n\nChange-Id: I746ffed6289486b802a2292bfc492ea6c780ed0b\n"
    },
    {
      "commit": "c71a99131ca97bd3bdc5b78473d06e613e96e073",
      "tree": "5982cad9d4ca213cf9f7dbbe5cbca3de1771aa1f",
      "parents": [
        "4f53fe74051026e6635ba5bdbed4f1898cb66028"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Aug 29 09:31:26 2013 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@android.com",
        "time": "Wed Apr 02 11:41:03 2014 -0700"
      },
      "message": "Fix decoder EOS handling\n\nConceptually it should be the same whether EOS is signalled on the last\nbuffer holding data, or an empty buffer that follows. Make it so that\nthis actually behaves the same for mp3, AAC and Vorbis.\n\nb/8747869\n\nChange-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92\n"
    },
    {
      "commit": "99021c47f45ee8bf3317cff7d08226e76c8d8227",
      "tree": "5f8c264aefbb41cab611f5db8272c36827b9fa39",
      "parents": [
        "118e7ff24af2e470ffed2bf7b37c9afa69afee92",
        "f356a123bf966150965a1af1cb9bd6ff2ca020de"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Tue Apr 01 22:23:23 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Apr 01 22:23:23 2014 +0000"
      },
      "message": "am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrm\n\n* commit \u0027f356a123bf966150965a1af1cb9bd6ff2ca020de\u0027:\n  Support CAST V2 Authentication in MediaDrm\n"
    },
    {
      "commit": "f356a123bf966150965a1af1cb9bd6ff2ca020de",
      "tree": "22c31d7cd8430663ee6a78b5daafffc718f11454",
      "parents": [
        "4f1ef2cd65d734edae17f8586cf717598b40f2c3",
        "68d9d71a792deed75d32fe13febc07c9c12c8449"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Tue Apr 01 22:00:45 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Apr 01 22:00:45 2014 +0000"
      },
      "message": "am 68d9d71a: Support CAST V2 Authentication in MediaDrm\n\n* commit \u002768d9d71a792deed75d32fe13febc07c9c12c8449\u0027:\n  Support CAST V2 Authentication in MediaDrm\n"
    },
    {
      "commit": "54b0bc74e051bd7df10cd657b481d88db6cdaa27",
      "tree": "d0f66d92baae1b16a34e01eab18d640f3e2f8434",
      "parents": [
        "118e7ff24af2e470ffed2bf7b37c9afa69afee92"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Mon Mar 31 12:30:01 2014 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Tue Apr 01 13:29:44 2014 -0700"
      },
      "message": "ACodec: do not signal kWhatShutdownCompleted on codec error\n\nDo not signal kWhatShutdownCompleted when moving to Uninitialized\nstate due to receiving a codec error.\n\nDo not abort if error happens just before handling a stop request.\n\nBug: 13675112\nChange-Id: I4b14b2e64cff0f71215d2bbc24cd850617dfb67b\n"
    },
    {
      "commit": "ec5f7cc4756d389505e761b9d803a1a3a46b64d7",
      "tree": "2ca458e4746c799bcc2f69c4d39606e46ec943b2",
      "parents": [
        "5e184b0d12f1ec436246a391da8d9355cc21ee08"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Mon Mar 31 12:30:01 2014 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Mon Mar 31 17:14:22 2014 -0700"
      },
      "message": "MediaCodec: move to UNINITIALIZED state on codec error\n\nACodec moves to Uninitialized state after receiving codec error.\nMake MediaCodec also move to the same state, so stop() and\nrelease() will work correctly.\n\nBug: 13675112\nChange-Id: I1c7e8b274f68345fc0e6a55c70dff6c7a4fb2e72\n"
    },
    {
      "commit": "68d9d71a792deed75d32fe13febc07c9c12c8449",
      "tree": "15ba0a2a541bd0b69fa286d04c9cc40d30b49871",
      "parents": [
        "1000d426bedb1ec38bdfff98fc8f004b64af13cb"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Tue Mar 04 13:21:31 2014 -0800"
      },
      "committer": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Sat Mar 29 08:43:09 2014 -0700"
      },
      "message": "Support CAST V2 Authentication in MediaDrm\n\nJava API version\n\nUpdate frameworks to enable support for CAST\nV2 Authentication in the DRM Plugin.\n\nChange-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861\nrelated-to-bug: 12702350\n"
    },
    {
      "commit": "5e184b0d12f1ec436246a391da8d9355cc21ee08",
      "tree": "65fee93841a06248c237e858678166d7aa66f55a",
      "parents": [
        "b47558f87ee9bd4fce11a2d5bc213bd1aa9031a8"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Mar 28 14:37:51 2014 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Mar 28 14:37:51 2014 -0700"
      },
      "message": "ACodec: ignore OMX messages to already freed component\n\nBug: 12916984\nChange-Id: I92848797b8d556cff468b9b0f0a618946083208f\n"
    },
    {
      "commit": "b47558f87ee9bd4fce11a2d5bc213bd1aa9031a8",
      "tree": "762e884fdd1ab5720f2de39080188cbf1b868d77",
      "parents": [
        "1490d5142d8d485ea0d56a9974726fb6dff0a62d"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Mar 28 09:53:46 2014 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Mar 28 09:58:26 2014 -0700"
      },
      "message": "mediaplayer: add temporary developer settings to use NuPlayer as default\n\nBug: 11784824\nChange-Id: Ic98f5fd15ee283d7f581bdc3331d000198ecc9e8\n"
    },
    {
      "commit": "4f1ef2cd65d734edae17f8586cf717598b40f2c3",
      "tree": "ef7587a0fa6221794a277b87812ea23d54c85406",
      "parents": [
        "ff382d0c40493303ceb81a6c22d1a48c0fecfe9c",
        "1000d426bedb1ec38bdfff98fc8f004b64af13cb"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Mar 28 01:50:50 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Mar 28 01:50:50 2014 +0000"
      },
      "message": "am 1000d426: am f780d28d: Merge \"DO NOT MERGE: Revert \"mediaplayer: keep more buffers with the BufferQueue\"\" into klp-dev\n\n* commit \u00271000d426bedb1ec38bdfff98fc8f004b64af13cb\u0027:\n  DO NOT MERGE: Revert \"mediaplayer: keep more buffers with the BufferQueue\"\n"
    },
    {
      "commit": "ff382d0c40493303ceb81a6c22d1a48c0fecfe9c",
      "tree": "7762984677d2b29965cfbdacf584ca8fa9b7c941",
      "parents": [
        "c3dcf1007aa964f825b2ea2ef86acb7f332e748f",
        "8bf96c011ff4128f9bf06b892a38d869192d6a25"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Mar 28 01:50:50 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Mar 28 01:50:50 2014 +0000"
      },
      "message": "am 8bf96c01: am 3d4e4fcb: Merge \"DO NOT MERGE: Revert \"stagefright: allow for minUndequeuedBufs to be one less\"\" into klp-dev\n\n* commit \u00278bf96c011ff4128f9bf06b892a38d869192d6a25\u0027:\n  DO NOT MERGE: Revert \"stagefright: allow for minUndequeuedBufs to be one less\"\n"
    },
    {
      "commit": "1000d426bedb1ec38bdfff98fc8f004b64af13cb",
      "tree": "97d6e219016a2ab6613ee979f3b0648274f0f2a6",
      "parents": [
        "8bf96c011ff4128f9bf06b892a38d869192d6a25",
        "f780d28de2e3cf7f6b26b9626321dba75719736e"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Mar 28 01:45:11 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Mar 28 01:45:11 2014 +0000"
      },
      "message": "am f780d28d: Merge \"DO NOT MERGE: Revert \"mediaplayer: keep more buffers with the BufferQueue\"\" into klp-dev\n\n* commit \u0027f780d28de2e3cf7f6b26b9626321dba75719736e\u0027:\n  DO NOT MERGE: Revert \"mediaplayer: keep more buffers with the BufferQueue\"\n"
    },
    {
      "commit": "8bf96c011ff4128f9bf06b892a38d869192d6a25",
      "tree": "369426fa05f2923450b30b6f6f424a5aa0da7c5b",
      "parents": [
        "65550a0e17852fe657795508e3bf05bdbfb2520b",
        "3d4e4fcbcfc5c16dd794591727f5c713831ab6dc"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Mar 28 01:45:10 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Mar 28 01:45:10 2014 +0000"
      },
      "message": "am 3d4e4fcb: Merge \"DO NOT MERGE: Revert \"stagefright: allow for minUndequeuedBufs to be one less\"\" into klp-dev\n\n* commit \u00273d4e4fcbcfc5c16dd794591727f5c713831ab6dc\u0027:\n  DO NOT MERGE: Revert \"stagefright: allow for minUndequeuedBufs to be one less\"\n"
    },
    {
      "commit": "f780d28de2e3cf7f6b26b9626321dba75719736e",
      "tree": "e5a07b57875ac19f3e86c64e650cd0e41739c231",
      "parents": [
        "3d4e4fcbcfc5c16dd794591727f5c713831ab6dc",
        "114c1b6553e3d2dc5f2780a76d92bb382234220c"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Mar 28 00:11:23 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Mar 28 00:11:24 2014 +0000"
      },
      "message": "Merge \"DO NOT MERGE: Revert \"mediaplayer: keep more buffers with the BufferQueue\"\" into klp-dev"
    },
    {
      "commit": "3d4e4fcbcfc5c16dd794591727f5c713831ab6dc",
      "tree": "acf2c5ba89002a15ef82677408f11dabc040adf8",
      "parents": [
        "0370be96e33ea0c8fb4069e704deccce43b7403c",
        "f5ee327780ea2b538b8affafa8063f0ce0390fe0"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Mar 28 00:11:04 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Mar 28 00:11:04 2014 +0000"
      },
      "message": "Merge \"DO NOT MERGE: Revert \"stagefright: allow for minUndequeuedBufs to be one less\"\" into klp-dev"
    },
    {
      "commit": "114c1b6553e3d2dc5f2780a76d92bb382234220c",
      "tree": "4402098cdfb6cbaa5e633434c1b0f91b3064a2f4",
      "parents": [
        "f5ee327780ea2b538b8affafa8063f0ce0390fe0"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Mar 27 16:44:23 2014 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Mar 27 17:08:00 2014 -0700"
      },
      "message": "DO NOT MERGE: Revert \"mediaplayer: keep more buffers with the BufferQueue\"\n\nThis reverts commit b635b0e66b257ab442e230bca96afd5105cf6829.\n\nBug: 13655631\n"
    },
    {
      "commit": "f5ee327780ea2b538b8affafa8063f0ce0390fe0",
      "tree": "d9cf368c102fd957979b9764795bcb23f752dc4e",
      "parents": [
        "f622e2c78407b50806a53a06a89b2b6546420f55"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Mar 27 16:41:37 2014 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Mar 27 17:08:00 2014 -0700"
      },
      "message": "DO NOT MERGE: Revert \"stagefright: allow for minUndequeuedBufs to be one less\"\n\nThis reverts commit a0470879e25394cb85437366fa53ce8055cd556f.\n\nBug: 13655631\n"
    },
    {
      "commit": "c9b8d90dabdf1234be0117c592f635a92c4eb0d9",
      "tree": "8bbeb033b0eb0bcbbfb12faaa6f2133d3cd093ea",
      "parents": [
        "5c4fa907328c8ee586367272c7525cb87742f14d",
        "142f519aa1acd5804d111e60d100f170fed28405"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Mar 26 23:23:09 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Mar 26 23:23:09 2014 +0000"
      },
      "message": "Merge \"Use symbol AUDIO_IO_HANDLE_NONE from \u003csystem/audio.h\u003e\""
    },
    {
      "commit": "5c4fa907328c8ee586367272c7525cb87742f14d",
      "tree": "072ee3fe93cbcc8505118b51bc371265214036f3",
      "parents": [
        "2301acc6a9c7a3af4ad01f3d1d0f76f13eca7350",
        "adad3d7d935da176ff24941b4ae9edf7340e9b96"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Mar 26 22:22:23 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Mar 26 22:22:24 2014 +0000"
      },
      "message": "Merge \"Use LOG_ALWAYS_FATAL instead of LOG_FATAL\""
    },
    {
      "commit": "142f519aa1acd5804d111e60d100f170fed28405",
      "tree": "aaffc4a234a4b0a5e719374056edf12eb2333b29",
      "parents": [
        "ecdca392ed40e89a6ef14b86446e952c35497ac4"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Mar 25 17:44:59 2014 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Mar 26 14:56:54 2014 -0700"
      },
      "message": "Use symbol AUDIO_IO_HANDLE_NONE from \u003csystem/audio.h\u003e\n\nChange-Id: Id6b1aa17558eb73e17f22b8eab6cd02e00a96dff\n"
    },
    {
      "commit": "2301acc6a9c7a3af4ad01f3d1d0f76f13eca7350",
      "tree": "6dde0cdf76066b31d3e0c0c96ea8e36990266fce",
      "parents": [
        "ecdca392ed40e89a6ef14b86446e952c35497ac4"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Jan 17 10:21:00 2014 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Mar 26 14:49:23 2014 -0700"
      },
      "message": "Update comments\n\nChange-Id: I5776313b9b49072cd666d28880f0d07cc73f827b\n"
    },
    {
      "commit": "adad3d7d935da176ff24941b4ae9edf7340e9b96",
      "tree": "7a8a2f8e31c7dd690805c1cfd9982d218c66296b",
      "parents": [
        "1392eb3d1802e9f894f87d7a7387207d1b6faca1"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Feb 21 14:51:43 2014 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Mar 26 14:46:28 2014 -0700"
      },
      "message": "Use LOG_ALWAYS_FATAL instead of LOG_FATAL\n\nLOG_FATAL is compiled out in most builds, so the\nassertion checks were not being performed.\n\nChange-Id: I774f0985ab9c5ccecd8989a0f1c940386b73fc35\n"
    },
    {
      "commit": "ecdca392ed40e89a6ef14b86446e952c35497ac4",
      "tree": "bf796efe37aca6ded41ca0ad4291ca344af337ac",
      "parents": [
        "51beebba9d4989d05831a13bbe5cdf53ecac1bf5",
        "66e4635cb09fadcaccf912f37c387396c428378a"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Mar 26 21:29:28 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Mar 26 21:29:28 2014 +0000"
      },
      "message": "Merge \"Use symbolic constants from \u003csystem/audio.h\u003e\""
    },
    {
      "commit": "51beebba9d4989d05831a13bbe5cdf53ecac1bf5",
      "tree": "b2c6af1099ba3c20b8dd08d39f8dcf822303971a",
      "parents": [
        "b8f8d231685afdec472136b45c527a71bfb8bcc4",
        "45faf7e02791993a487d6e038d16ff46395f1975"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Mar 26 21:14:17 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Mar 26 21:14:17 2014 +0000"
      },
      "message": "Merge \"Use symbol AUDIO_DEVICE_NONE from \u003csystem/audio.h\u003e\""
    },
    {
      "commit": "b8f8d231685afdec472136b45c527a71bfb8bcc4",
      "tree": "8f5afcbeec0aa0e9c441c5fc1c42a8a8b35d77f3",
      "parents": [
        "9b6fcc2f8294d21b859b4cbcff84107a499e221f",
        "0ed19594452c901c3c8665d06610fffe46895d06"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Mar 26 21:13:18 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Mar 26 21:13:18 2014 +0000"
      },
      "message": "Merge \"Remove stream type from AudioSystem::getRenderPosition()\""
    },
    {
      "commit": "73ec11738cd4399c55d4905665a14a7c4cd42cbf",
      "tree": "1105d7402857079f44e234ba1ab6ecfa8290a094",
      "parents": [
        "8c7b9fb41585fccb06573252823b929c82a40999",
        "9ea65d0f4a564478343b1a722fae4ce5883670c3"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Mar 26 20:56:04 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Mar 26 20:56:04 2014 +0000"
      },
      "message": "Merge \"Fix uses of KeyedVector\""
    },
    {
      "commit": "8c7b9fb41585fccb06573252823b929c82a40999",
      "tree": "b15b9c23c2440bf1df24350f1034064016110897",
      "parents": [
        "f7f21b93bfce562784ee8f632fb01a2f8e4ffa6b",
        "241618f1b286f9e7e02fe61e96d9194e2e1e8a7a"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Mar 26 20:44:48 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Mar 26 20:44:49 2014 +0000"
      },
      "message": "Merge \"Remove streamType parameter from AudioSystem::getLatency()\""
    },
    {
      "commit": "0ed19594452c901c3c8665d06610fffe46895d06",
      "tree": "54d8cd6a63a3f85d6199d4a9d6b7981fab14b973",
      "parents": [
        "1392eb3d1802e9f894f87d7a7387207d1b6faca1"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Mar 26 07:50:05 2014 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Mar 26 19:22:40 2014 +0000"
      },
      "message": "Remove stream type from AudioSystem::getRenderPosition()\n\nThe I/O handle is never equal to AUDIO_IO_HANDLE_NONE,\nso the stream type is not needed.\n\nChange-Id: I1ab134a2fa379d6dd0b6167345a856a192d478f9\n"
    },
    {
      "commit": "f7f21b93bfce562784ee8f632fb01a2f8e4ffa6b",
      "tree": "e5222e0f1f2ff320e83dfe8ef4a068b87be677d0",
      "parents": [
        "887bbadb3e1de315c74c905594ee5f2d29a5675c",
        "ebb80e4f9873cc1a5ee3f766323f622bb0c07ae5"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Mar 26 18:59:01 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Mar 26 18:59:01 2014 +0000"
      },
      "message": "Merge \"Remove dead code\""
    },
    {
      "commit": "887bbadb3e1de315c74c905594ee5f2d29a5675c",
      "tree": "f38f24c20246991410df96339f85fc58db6b987b",
      "parents": [
        "11af89b744733e8c75d48a8d1a566c701c821865",
        "3f35eb55f0e2bc5a4dda7f58ed52654403a87efa"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Mar 26 18:44:40 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Mar 26 18:44:41 2014 +0000"
      },
      "message": "Merge \"Fix log spam when MonoPipe is unable to get local frequency\""
    }
  ],
  "next": "ebb80e4f9873cc1a5ee3f766323f622bb0c07ae5"
}