)]}'
{
  "log": [
    {
      "commit": "837b8184e1307991578de5d5d25b62a67bb225f6",
      "tree": "dff89f05576533422f8e5caf2c25efac5c4455d0",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Nov 30 09:05:19 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Mon Dec 12 13:40:06 2011 -0800"
      },
      "message": "Delete obsolete includes\n\nChange-Id: I960a179a026ff8d710b43b64cb358f18ee04de16\n"
    },
    {
      "commit": "eebeceec684a36222b4559e3157b0db04c0a67ed",
      "tree": "30db66d7414a91c0f1d123ec263e2b1de73a77f3",
      "parents": [
        "43afd557f8b4b87561321135cf284b14e87c2bc6",
        "59a6c2874abdee0123aba4d251d0c81df393efb8"
      ],
      "author": {
        "name": "Dave Burke",
        "email": "daveburke@google.com",
        "time": "Wed Dec 07 14:11:14 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Dec 07 14:11:14 2011 -0800"
      },
      "message": "am 6727a43f: am 54a53841: Merge \"Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.\" into ics-mr1\n\n* commit \u00276727a43f6d8ff193b86ca90b2daa761c47157638\u0027:\n  Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.\n"
    },
    {
      "commit": "59a6c2874abdee0123aba4d251d0c81df393efb8",
      "tree": "c0f8622f3613dfbeb0975a0792cb46093e0918b8",
      "parents": [
        "1b37b40f3c39863ecc6c404b177fc0c961f32dce",
        "2c170cd8e308712674edd2cc7eebea70359d4951"
      ],
      "author": {
        "name": "Dave Burke",
        "email": "daveburke@google.com",
        "time": "Wed Dec 07 14:08:13 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Dec 07 14:08:13 2011 -0800"
      },
      "message": "am 54a53841: Merge \"Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.\" into ics-mr1\n\n* commit \u002754a53841a9ff48ba4cd004469ae4ff77caed900a\u0027:\n  Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.\n"
    },
    {
      "commit": "2c170cd8e308712674edd2cc7eebea70359d4951",
      "tree": "c0f8622f3613dfbeb0975a0792cb46093e0918b8",
      "parents": [
        "0c4ec128aa324f99f726a314bd97e8a581f22ec5",
        "bab412099ab1bd3e9e942453cbb42c87ea9a59ec"
      ],
      "author": {
        "name": "Dave Burke",
        "email": "daveburke@google.com",
        "time": "Wed Dec 07 14:05:41 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Dec 07 14:05:41 2011 -0800"
      },
      "message": "Merge \"Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.\" into ics-mr1"
    },
    {
      "commit": "bab412099ab1bd3e9e942453cbb42c87ea9a59ec",
      "tree": "c0f8622f3613dfbeb0975a0792cb46093e0918b8",
      "parents": [
        "72936144fd16d6d73b7383b634d53909f4887d2b"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Dec 07 12:50:47 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Dec 07 12:50:47 2011 -0800"
      },
      "message": "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.\n\nChange-Id: Icb10c129249bb9b69e91f6633a385840c94efa59\nrelated-to-bug: 5666532\n"
    },
    {
      "commit": "43afd557f8b4b87561321135cf284b14e87c2bc6",
      "tree": "9d54b94b6a9b0fcfb456ae05e21953e8ea97d9f0",
      "parents": [
        "36d4f8f2a5929d181deccb73332372b0a412bea6",
        "434e86339ecbcc93c85617f760661c765199e118"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Dec 07 07:44:31 2011 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Dec 07 07:44:31 2011 -0800"
      },
      "message": "Reconcile with ics-mr1-release\n\nChange-Id: Ie377d01065e1c34c60a97df3725e56100bae3903\n"
    },
    {
      "commit": "36d4f8f2a5929d181deccb73332372b0a412bea6",
      "tree": "9d54b94b6a9b0fcfb456ae05e21953e8ea97d9f0",
      "parents": [
        "44bec2e1e2072ebaeeb96bde2c639c48beae1bf9",
        "1b37b40f3c39863ecc6c404b177fc0c961f32dce"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Dec 07 07:29:38 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Dec 07 07:29:38 2011 -0800"
      },
      "message": "am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with ics-mr0-release\n\n* commit \u00276ee7bca1ce7f93d33a70701bb7862c3d13e68b89\u0027:\n  DO NOT MERGE: Remove the AVI extractor.\n  Disable wifiwatchdog for now\n"
    },
    {
      "commit": "1b37b40f3c39863ecc6c404b177fc0c961f32dce",
      "tree": "ebca213f22bc3adee2b0c9efd3fb0aedef86918b",
      "parents": [
        "fcab2a8d5644875361f39f271fa9ffde59709c07",
        "0c4ec128aa324f99f726a314bd97e8a581f22ec5"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Dec 07 07:27:57 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Dec 07 07:27:57 2011 -0800"
      },
      "message": "am 3de8d36b: Reconcile with ics-mr0-release\n\n* commit \u00273de8d36b6fd166cf63ca256c455c0ea26a849668\u0027:\n  DO NOT MERGE: Remove the AVI extractor.\n  Disable wifiwatchdog for now\n"
    },
    {
      "commit": "0c4ec128aa324f99f726a314bd97e8a581f22ec5",
      "tree": "ebca213f22bc3adee2b0c9efd3fb0aedef86918b",
      "parents": [
        "72936144fd16d6d73b7383b634d53909f4887d2b",
        "01fe81c26d27af4d2e24482dcf2b910d983b0f7c"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Dec 07 07:24:54 2011 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Dec 07 07:24:54 2011 -0800"
      },
      "message": "Reconcile with ics-mr0-release\n\nChange-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47\n"
    },
    {
      "commit": "44bec2e1e2072ebaeeb96bde2c639c48beae1bf9",
      "tree": "9d54b94b6a9b0fcfb456ae05e21953e8ea97d9f0",
      "parents": [
        "1add6848e09a89d0828a0117d0dd9bb2b2341000",
        "6c83e3be2921009ff7dcfced2a3eda7811b8b041"
      ],
      "author": {
        "name": "Narayan Kamath",
        "email": "narayan@google.com",
        "time": "Wed Dec 07 04:15:43 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Dec 07 04:15:43 2011 -0800"
      },
      "message": "Merge \"Allow data uris to be data sources\""
    },
    {
      "commit": "1add6848e09a89d0828a0117d0dd9bb2b2341000",
      "tree": "6a3dcfe5e1ffcc3d3f839e19ded8b645f352f51e",
      "parents": [
        "75e7c07412f0dc55633dd0b81d4358ebe307eb0f",
        "fcab2a8d5644875361f39f271fa9ffde59709c07"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Dec 06 16:59:52 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Dec 06 16:59:52 2011 -0800"
      },
      "message": "am 92860d5d: (-s ours) am 791a3183: Merge \"Merge commit \\\u0027babb7200\\\u0027 into manualmerge\" into ics-mr1\n\n* commit \u002792860d5d4681e684d5f3936137c6c067c950121e\u0027:\n  DO NOT MERGE: Remove the AVI extractor.\n"
    },
    {
      "commit": "434e86339ecbcc93c85617f760661c765199e118",
      "tree": "ebca213f22bc3adee2b0c9efd3fb0aedef86918b",
      "parents": [
        "72936144fd16d6d73b7383b634d53909f4887d2b",
        "5f14e44ef801dd2c3e35f816bdc8c709482d8ebb"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Tue Dec 06 16:54:17 2011 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Tue Dec 06 16:54:17 2011 -0800"
      },
      "message": "merge in ics-mr1-release history after reset to ics-mr1\n"
    },
    {
      "commit": "fcab2a8d5644875361f39f271fa9ffde59709c07",
      "tree": "ebca213f22bc3adee2b0c9efd3fb0aedef86918b",
      "parents": [
        "78074d5dc8122d750d97065a6d5ec419e26350d4",
        "72936144fd16d6d73b7383b634d53909f4887d2b"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Dec 06 16:22:07 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Dec 06 16:22:07 2011 -0800"
      },
      "message": "am 791a3183: Merge \"Merge commit \\\u0027babb7200\\\u0027 into manualmerge\" into ics-mr1\n\n* commit \u0027791a31832ab586f056c2bcab8e0515d4bb1e2f7a\u0027:\n  DO NOT MERGE: Remove the AVI extractor.\n"
    },
    {
      "commit": "75e7c07412f0dc55633dd0b81d4358ebe307eb0f",
      "tree": "6a3dcfe5e1ffcc3d3f839e19ded8b645f352f51e",
      "parents": [
        "51a841af801adf360842b1de48f9564af2c1cb25",
        "78074d5dc8122d750d97065a6d5ec419e26350d4"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Tue Dec 06 16:04:38 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Dec 06 16:04:38 2011 -0800"
      },
      "message": "am 49782b81: (-s ours) am 6b8b5a0a: Merge \"DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames\" into ics-mr1\n\n* commit \u002749782b8100a752056f044f6f3f1cf16a6a1f03b4\u0027:\n  DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames\n"
    },
    {
      "commit": "51a841af801adf360842b1de48f9564af2c1cb25",
      "tree": "6a3dcfe5e1ffcc3d3f839e19ded8b645f352f51e",
      "parents": [
        "c50480791ba002f3a77a870c9dea8416ee924c8f",
        "4a5110810e7d5b833f08cca3855225521a20230c"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Dec 06 16:04:36 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Dec 06 16:04:36 2011 -0800"
      },
      "message": "am c4738293: (-s ours) am 05d63069: Merge \"DO NOT MERGE: Remove the AVI extractor.\" into ics-mr1\n\n* commit \u0027c4738293527618f9a228c3f0f645c0a0704ada9c\u0027:\n  DO NOT MERGE: Remove the AVI extractor.\n"
    },
    {
      "commit": "72936144fd16d6d73b7383b634d53909f4887d2b",
      "tree": "ebca213f22bc3adee2b0c9efd3fb0aedef86918b",
      "parents": [
        "e74de52d4e22fc61d41f703672fa8f1215446ab5",
        "62157c64096fe7065d4f99ad21edda41b208a808"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Dec 06 15:03:10 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Dec 06 15:03:10 2011 -0800"
      },
      "message": "Merge commit \u0027babb7200\u0027 into manualmerge\n"
    },
    {
      "commit": "01fe81c26d27af4d2e24482dcf2b910d983b0f7c",
      "tree": "25e0529e98839abf121158098a13b96a01314bbd",
      "parents": [
        "91e2c7d2988c4947aca8a637f88a2179d905b970"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Dec 06 10:59:48 2011 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Tue Dec 06 14:23:38 2011 -0800"
      },
      "message": "DO NOT MERGE: Remove the AVI extractor.\n\nChange-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0\n"
    },
    {
      "commit": "78074d5dc8122d750d97065a6d5ec419e26350d4",
      "tree": "ebca213f22bc3adee2b0c9efd3fb0aedef86918b",
      "parents": [
        "4a5110810e7d5b833f08cca3855225521a20230c",
        "e74de52d4e22fc61d41f703672fa8f1215446ab5"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Tue Dec 06 12:55:39 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Dec 06 12:55:39 2011 -0800"
      },
      "message": "am 6b8b5a0a: Merge \"DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames\" into ics-mr1\n\n* commit \u00276b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3\u0027:\n  DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames\n"
    },
    {
      "commit": "e74de52d4e22fc61d41f703672fa8f1215446ab5",
      "tree": "ebca213f22bc3adee2b0c9efd3fb0aedef86918b",
      "parents": [
        "f7b5cdd410cb8fdd46bac5b5098e0f01442bba12",
        "223e70d6bde101349cba04b20ef243730cf84c07"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Tue Dec 06 12:52:52 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Dec 06 12:52:52 2011 -0800"
      },
      "message": "Merge \"DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames\" into ics-mr1"
    },
    {
      "commit": "4a5110810e7d5b833f08cca3855225521a20230c",
      "tree": "93705014698e68b09f4558f9406cd2c6e34a5ef0",
      "parents": [
        "c4ce69a593d3e565877163a8703f72aa6b451a38",
        "f7b5cdd410cb8fdd46bac5b5098e0f01442bba12"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Dec 06 12:46:46 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Dec 06 12:46:46 2011 -0800"
      },
      "message": "am 05d63069: Merge \"DO NOT MERGE: Remove the AVI extractor.\" into ics-mr1\n\n* commit \u002705d630691127c022befd071b2bede87c707112a9\u0027:\n  DO NOT MERGE: Remove the AVI extractor.\n"
    },
    {
      "commit": "f7b5cdd410cb8fdd46bac5b5098e0f01442bba12",
      "tree": "93705014698e68b09f4558f9406cd2c6e34a5ef0",
      "parents": [
        "9e603e057d6cc80e6b7e948b9af13b1a7b736008"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Dec 06 10:01:27 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Dec 06 11:24:34 2011 -0800"
      },
      "message": "DO NOT MERGE: Remove the AVI extractor.\n\nChange-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e\n"
    },
    {
      "commit": "62157c64096fe7065d4f99ad21edda41b208a808",
      "tree": "25e0529e98839abf121158098a13b96a01314bbd",
      "parents": [
        "91e2c7d2988c4947aca8a637f88a2179d905b970"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Dec 06 10:59:48 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Dec 06 11:21:02 2011 -0800"
      },
      "message": "DO NOT MERGE: Remove the AVI extractor.\n\nChange-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0\n"
    },
    {
      "commit": "6c83e3be2921009ff7dcfced2a3eda7811b8b041",
      "tree": "9d54b94b6a9b0fcfb456ae05e21953e8ea97d9f0",
      "parents": [
        "2013d4d159bfc29b4143d3b5fd4735f51a03684c"
      ],
      "author": {
        "name": "Narayan Kamath",
        "email": "narayan@google.com",
        "time": "Wed Nov 16 15:57:29 2011 +0000"
      },
      "committer": {
        "name": "Narayan Kamath",
        "email": "narayan@google.com",
        "time": "Tue Dec 06 17:31:39 2011 +0000"
      },
      "message": "Allow data uris to be data sources\n\nbug:5571010\nChange-Id: I0b6ae6c729ac34d46e9990fcceb08294eb4f7c58\n"
    },
    {
      "commit": "c50480791ba002f3a77a870c9dea8416ee924c8f",
      "tree": "6a3dcfe5e1ffcc3d3f839e19ded8b645f352f51e",
      "parents": [
        "2013d4d159bfc29b4143d3b5fd4735f51a03684c",
        "5f14e44ef801dd2c3e35f816bdc8c709482d8ebb"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Dec 06 09:02:57 2011 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Dec 06 09:02:58 2011 -0800"
      },
      "message": "Reconcile with ics-mr1-release\n\nChange-Id: I2790bcf28bdac1335b4106138fc6ad471ac40516\n"
    },
    {
      "commit": "5f14e44ef801dd2c3e35f816bdc8c709482d8ebb",
      "tree": "7db009c66d5cc856ea1fb042a916a7b395972169",
      "parents": [
        "9e603e057d6cc80e6b7e948b9af13b1a7b736008",
        "36126b2f17223803c981e4ff7bca2d751d971753"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Mon Dec 05 20:36:01 2011 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Mon Dec 05 20:36:01 2011 -0800"
      },
      "message": "merge in ics-mr1-release history after reset to ics-mr1\n"
    },
    {
      "commit": "2013d4d159bfc29b4143d3b5fd4735f51a03684c",
      "tree": "6a3dcfe5e1ffcc3d3f839e19ded8b645f352f51e",
      "parents": [
        "456caf3f5f0af673dc120c17c23635f40d8f5ac2",
        "c4ce69a593d3e565877163a8703f72aa6b451a38"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon Dec 05 17:25:37 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Dec 05 17:25:37 2011 -0800"
      },
      "message": "am 5433e25f: am 7b6aff23: Merge \"audioflinger: fix audio skipping over A2DP\" into ics-mr1\n\n* commit \u00275433e25f6ce013860ff2a074ad8d1158cc39ab91\u0027:\n  audioflinger: fix audio skipping over A2DP\n"
    },
    {
      "commit": "c4ce69a593d3e565877163a8703f72aa6b451a38",
      "tree": "7db009c66d5cc856ea1fb042a916a7b395972169",
      "parents": [
        "1a733a33e1428f577747fcd74dccd8853bd1b29f",
        "9e603e057d6cc80e6b7e948b9af13b1a7b736008"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon Dec 05 17:22:58 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Dec 05 17:22:58 2011 -0800"
      },
      "message": "am 7b6aff23: Merge \"audioflinger: fix audio skipping over A2DP\" into ics-mr1\n\n* commit \u00277b6aff23735a9ef8759c5ecb4427784413e9b85b\u0027:\n  audioflinger: fix audio skipping over A2DP\n"
    },
    {
      "commit": "9e603e057d6cc80e6b7e948b9af13b1a7b736008",
      "tree": "7db009c66d5cc856ea1fb042a916a7b395972169",
      "parents": [
        "a0f2bf56e30f580535229fa6a58e7d48b762727c",
        "162b40bbaf3c3a24f61a6636bef6f80a9c0a31dd"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon Dec 05 17:20:53 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Dec 05 17:20:53 2011 -0800"
      },
      "message": "Merge \"audioflinger: fix audio skipping over A2DP\" into ics-mr1"
    },
    {
      "commit": "223e70d6bde101349cba04b20ef243730cf84c07",
      "tree": "5d8f574d8faaea100cb3937e3cf8e0b0b8f7b427",
      "parents": [
        "a0f2bf56e30f580535229fa6a58e7d48b762727c"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Mon Dec 05 12:41:06 2011 -0800"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Mon Dec 05 14:29:18 2011 -0800"
      },
      "message": "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames\n\nThe current logic does not check the I-frame at zeroeth position and therefore\nfor the files with only 1 I-Frame at zeroeth postion does not play.\n\nOriginally authored by Braganza Sam Robertsh \u003csam.braganza@samsung.com\u003e\n\nDo not merge to master branch since we made some improvement to SampleTable.cpp in the master branch.\n\nChange-Id: I068184dec71986f14a586f769c2af1f52b4bcf94\nrelated-to-bug: 5711942\n"
    },
    {
      "commit": "456caf3f5f0af673dc120c17c23635f40d8f5ac2",
      "tree": "0c7007b18f37e2311147e34b44189ebf487c6991",
      "parents": [
        "2158db000d227875b12c85c850ec6e3039553f9b",
        "1a733a33e1428f577747fcd74dccd8853bd1b29f"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Mon Dec 05 13:30:52 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Mon Dec 05 13:31:17 2011 -0800"
      },
      "message": "resolved conflicts for merge of 07bacabe to master\n\nChange-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1\n"
    },
    {
      "commit": "1a733a33e1428f577747fcd74dccd8853bd1b29f",
      "tree": "f375e7f5e9f183289bbd5c907f90b89924f11aa8",
      "parents": [
        "fa845c6d4637fee51b34d9c1cf06db42b97ac0f4",
        "a0f2bf56e30f580535229fa6a58e7d48b762727c"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Mon Dec 05 12:03:41 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Dec 05 12:03:41 2011 -0800"
      },
      "message": "am f2e12498: Merge \"Properly identify how much metadata we need to cache in order to instantiate\" into ics-mr1\n\n* commit \u0027f2e1249846a17c69d728189a8dc67f37261f0a59\u0027:\n  Properly identify how much metadata we need to cache in order to instantiate\n"
    },
    {
      "commit": "a0f2bf56e30f580535229fa6a58e7d48b762727c",
      "tree": "f375e7f5e9f183289bbd5c907f90b89924f11aa8",
      "parents": [
        "fed8bb604c31bf6a60ca84aafed016d21d3e0f90"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Mon Dec 05 11:34:43 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Mon Dec 05 11:34:43 2011 -0800"
      },
      "message": "Properly identify how much metadata we need to cache in order to instantiate\n\nthe extractor without blocking (and therefore be able to abort).\n\nChange-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3\nrelated-to-bug: 5666532\n"
    },
    {
      "commit": "162b40bbaf3c3a24f61a6636bef6f80a9c0a31dd",
      "tree": "799acc096d19121f9d7ec271bfdcb4f65a118df2",
      "parents": [
        "7cafbb32999049873d4746ba83bd20c88abe6ce6"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon Dec 05 09:47:19 2011 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon Dec 05 10:40:18 2011 -0800"
      },
      "message": "audioflinger: fix audio skipping over A2DP\n\nThe maximum sleep time allowed in the mixer thread when audio tracks\nare enabled but not ready for mixing is derived from the latency\nreported by the output stream.\nThis does not work for A2DP where the latency also reflects encoding, decoding\nand transfer time.\n\nModified activeSleepTimeUs() to take A2DP case into account.\n\nIssue 5682206.\n\nChange-Id: I3784ac01fb6f836b5a6ce6f764fb15347586de35\n"
    },
    {
      "commit": "2158db000d227875b12c85c850ec6e3039553f9b",
      "tree": "27c6aed77ee974054e91426386a8daa23ca4bab6",
      "parents": [
        "0cb4b9a6aa1f1f28b7b5d3e02b1d7fac70817b0a",
        "36126b2f17223803c981e4ff7bca2d751d971753"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Mon Dec 05 08:53:06 2011 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Mon Dec 05 08:53:06 2011 -0800"
      },
      "message": "Reconcile with ics-mr1-release\n\nChange-Id: I35fea7fba390129cec15616718e2880bfa3b414c\n"
    },
    {
      "commit": "0cb4b9a6aa1f1f28b7b5d3e02b1d7fac70817b0a",
      "tree": "27c6aed77ee974054e91426386a8daa23ca4bab6",
      "parents": [
        "326805adc3be4936a26c60be107c205f492a82e1",
        "fa845c6d4637fee51b34d9c1cf06db42b97ac0f4"
      ],
      "author": {
        "name": "Mike Lockwood",
        "email": "lockwood@google.com",
        "time": "Fri Dec 02 17:57:19 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Dec 02 17:57:19 2011 -0800"
      },
      "message": "am 9f3f3c2f: (-s ours) am 1a3ece9f: Merge \"MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE\" into ics-mr1\n\n* commit \u00279f3f3c2fbe23a4d9360cffc9975e5cc99f67107e\u0027:\n  MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE\n"
    },
    {
      "commit": "326805adc3be4936a26c60be107c205f492a82e1",
      "tree": "27c6aed77ee974054e91426386a8daa23ca4bab6",
      "parents": [
        "651d4c66a0abb26e32a32d40d90988e98fe7f824",
        "7570af16ad9ad892d9cff6d733d29a25d736586d"
      ],
      "author": {
        "name": "Mike Lockwood",
        "email": "lockwood@google.com",
        "time": "Fri Dec 02 17:57:17 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Dec 02 17:57:17 2011 -0800"
      },
      "message": "am 7bbc3c4b: (-s ours) am 7f87d9cf: Merge \"MTP: Don\\\u0027t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE\" into ics-mr1\n\n* commit \u00277bbc3c4bbe9e542abba2ad30072efb1b25fd9ea2\u0027:\n  MTP: Don\u0027t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE\n"
    },
    {
      "commit": "36126b2f17223803c981e4ff7bca2d751d971753",
      "tree": "b6241932aebde1c0f71c9d52d63bb2ea7ef5adf7",
      "parents": [
        "fed8bb604c31bf6a60ca84aafed016d21d3e0f90",
        "42fb390d04ae77ff72a1ff41d32be04079b3c98b"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Fri Dec 02 16:21:23 2011 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Fri Dec 02 16:21:23 2011 -0800"
      },
      "message": "merge in ics-mr1-release history after reset to ics-mr1\n"
    },
    {
      "commit": "fa845c6d4637fee51b34d9c1cf06db42b97ac0f4",
      "tree": "b6241932aebde1c0f71c9d52d63bb2ea7ef5adf7",
      "parents": [
        "7570af16ad9ad892d9cff6d733d29a25d736586d",
        "fed8bb604c31bf6a60ca84aafed016d21d3e0f90"
      ],
      "author": {
        "name": "Mike Lockwood",
        "email": "lockwood@google.com",
        "time": "Fri Dec 02 13:22:17 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Dec 02 13:22:17 2011 -0800"
      },
      "message": "am 1a3ece9f: Merge \"MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE\" into ics-mr1\n\n* commit \u00271a3ece9f871c94eb524543ae618a2a1c88cab2cd\u0027:\n  MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE\n"
    },
    {
      "commit": "7570af16ad9ad892d9cff6d733d29a25d736586d",
      "tree": "89d39512087cd15a3fb44a8bb5f28e36303eeb19",
      "parents": [
        "1d26d11ebdc2cd53691b868e7dde844a708896a1",
        "8af4c7d02fc484ed1bdc082fc2a5383bc50f2180"
      ],
      "author": {
        "name": "Mike Lockwood",
        "email": "lockwood@google.com",
        "time": "Fri Dec 02 13:22:15 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Dec 02 13:22:15 2011 -0800"
      },
      "message": "am 7f87d9cf: Merge \"MTP: Don\\\u0027t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE\" into ics-mr1\n\n* commit \u00277f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1\u0027:\n  MTP: Don\u0027t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE\n"
    },
    {
      "commit": "fed8bb604c31bf6a60ca84aafed016d21d3e0f90",
      "tree": "b6241932aebde1c0f71c9d52d63bb2ea7ef5adf7",
      "parents": [
        "8af4c7d02fc484ed1bdc082fc2a5383bc50f2180"
      ],
      "author": {
        "name": "Mike Lockwood",
        "email": "lockwood@google.com",
        "time": "Thu Dec 01 16:58:41 2011 -0500"
      },
      "committer": {
        "name": "Mike Lockwood",
        "email": "lockwood@google.com",
        "time": "Fri Dec 02 15:12:47 2011 -0500"
      },
      "message": "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE\n\nBug: 5527220\n\nChange-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c\nSigned-off-by: Mike Lockwood \u003clockwood@google.com\u003e\n"
    },
    {
      "commit": "8af4c7d02fc484ed1bdc082fc2a5383bc50f2180",
      "tree": "89d39512087cd15a3fb44a8bb5f28e36303eeb19",
      "parents": [
        "4fe1c6c3988f79fd67c14a1f91e4b1df8a7e806f"
      ],
      "author": {
        "name": "Mike Lockwood",
        "email": "lockwood@google.com",
        "time": "Thu Dec 01 18:36:06 2011 -0500"
      },
      "committer": {
        "name": "Mike Lockwood",
        "email": "lockwood@google.com",
        "time": "Fri Dec 02 15:12:30 2011 -0500"
      },
      "message": "MTP: Don\u0027t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE\n\nThis could happen sometimes if other operations increased the size of the\ndata packet buffer to \u003e 16K\n\nChange-Id: I10f85f0ce32df39f46b0a984361958c0a13f6800\nSigned-off-by: Mike Lockwood \u003clockwood@google.com\u003e\n"
    },
    {
      "commit": "651d4c66a0abb26e32a32d40d90988e98fe7f824",
      "tree": "27c6aed77ee974054e91426386a8daa23ca4bab6",
      "parents": [
        "f9632207ec3fd477bfc5cd17a5950a21600b628c",
        "a9a46c1f53129be8fe1f3f0a6ea868d7b4c8f8f7"
      ],
      "author": {
        "name": "Mike Lockwood",
        "email": "lockwood@google.com",
        "time": "Fri Dec 02 08:17:33 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Dec 02 08:17:33 2011 -0800"
      },
      "message": "Merge \"MTP: Add support for restricting PTP to only certain subdirectories of the storage\""
    },
    {
      "commit": "f9632207ec3fd477bfc5cd17a5950a21600b628c",
      "tree": "327ad89c7a9e2e0f09a48680fb7e85a467635701",
      "parents": [
        "48bd916ffef341335237a4fa54d69c9deab1ab3c",
        "44c190826d72589f5c9e13d69e32673bd8bd7c64"
      ],
      "author": {
        "name": "Mike Lockwood",
        "email": "lockwood@google.com",
        "time": "Fri Dec 02 08:10:03 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Dec 02 08:10:03 2011 -0800"
      },
      "message": "Merge \"MTP: Don\u0027t attempt to read more than 16K at a time from the MTP driver\""
    },
    {
      "commit": "a9a46c1f53129be8fe1f3f0a6ea868d7b4c8f8f7",
      "tree": "27c6aed77ee974054e91426386a8daa23ca4bab6",
      "parents": [
        "44c190826d72589f5c9e13d69e32673bd8bd7c64"
      ],
      "author": {
        "name": "Mike Lockwood",
        "email": "lockwood@google.com",
        "time": "Thu Dec 01 16:58:41 2011 -0500"
      },
      "committer": {
        "name": "Mike Lockwood",
        "email": "lockwood@google.com",
        "time": "Fri Dec 02 11:08:39 2011 -0500"
      },
      "message": "MTP: Add support for restricting PTP to only certain subdirectories of the storage\n\nBug: 5527220\n\nChange-Id: If68e7481617ecb62abd24e2d89e6b7dfdf95ba2b\nSigned-off-by: Mike Lockwood \u003clockwood@google.com\u003e\n"
    },
    {
      "commit": "48bd916ffef341335237a4fa54d69c9deab1ab3c",
      "tree": "e755c472a80ff39ffac15d74460855e9f5dc725e",
      "parents": [
        "17078d8a83becd5bfb49a39f1415882b78d07a49",
        "42fb390d04ae77ff72a1ff41d32be04079b3c98b"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Dec 02 07:53:10 2011 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Dec 02 07:53:10 2011 -0800"
      },
      "message": "Reconcile with ics-mr1-release\n\nChange-Id: I1c603308272f9b00174c3f9046171e069ffee566\n"
    },
    {
      "commit": "42fb390d04ae77ff72a1ff41d32be04079b3c98b",
      "tree": "fba9ea601042188ab396e20cb69e98ffe6ff6290",
      "parents": [
        "4fe1c6c3988f79fd67c14a1f91e4b1df8a7e806f",
        "2907dac07c264b45d43b44d304fbe1865bd8c41f"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Thu Dec 01 16:45:56 2011 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Thu Dec 01 16:45:56 2011 -0800"
      },
      "message": "merge in ics-mr1-release history after reset to ics-mr1\n"
    },
    {
      "commit": "44c190826d72589f5c9e13d69e32673bd8bd7c64",
      "tree": "327ad89c7a9e2e0f09a48680fb7e85a467635701",
      "parents": [
        "17078d8a83becd5bfb49a39f1415882b78d07a49"
      ],
      "author": {
        "name": "Mike Lockwood",
        "email": "lockwood@google.com",
        "time": "Thu Dec 01 18:36:06 2011 -0500"
      },
      "committer": {
        "name": "Mike Lockwood",
        "email": "lockwood@google.com",
        "time": "Thu Dec 01 18:37:29 2011 -0500"
      },
      "message": "MTP: Don\u0027t attempt to read more than 16K at a time from the MTP driver\n\nThis could happen sometimes if other operations increased the size of the\ndata packet buffer to \u003e 16K\n\nChange-Id: I4d316c7e2e558d3dd861d39accae6514fd9a62f5\nSigned-off-by: Mike Lockwood \u003clockwood@google.com\u003e\n"
    },
    {
      "commit": "17078d8a83becd5bfb49a39f1415882b78d07a49",
      "tree": "e755c472a80ff39ffac15d74460855e9f5dc725e",
      "parents": [
        "2c0dd961d42ad75529a557240ed570f97b237d2f",
        "1d26d11ebdc2cd53691b868e7dde844a708896a1"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Thu Dec 01 10:22:19 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Dec 01 10:22:19 2011 -0800"
      },
      "message": "am 10526a0b: am 2c2ed7be: Merge \"Fixes a typo in AVIExtractor that would advertise the wrong video dimensions\" into ics-mr1\n\n* commit \u002710526a0bfe070ac4d1e550a81ed68be35d261b16\u0027:\n  Fixes a typo in AVIExtractor that would advertise the wrong video dimensions\n"
    },
    {
      "commit": "1d26d11ebdc2cd53691b868e7dde844a708896a1",
      "tree": "fba9ea601042188ab396e20cb69e98ffe6ff6290",
      "parents": [
        "15031854d15ffcc5c955290f61aa59aa09e1fde9",
        "4fe1c6c3988f79fd67c14a1f91e4b1df8a7e806f"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Thu Dec 01 10:20:09 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Dec 01 10:20:09 2011 -0800"
      },
      "message": "am 2c2ed7be: Merge \"Fixes a typo in AVIExtractor that would advertise the wrong video dimensions\" into ics-mr1\n\n* commit \u00272c2ed7bef931f43dc0701ab723beb0cbed2cb630\u0027:\n  Fixes a typo in AVIExtractor that would advertise the wrong video dimensions\n"
    },
    {
      "commit": "4fe1c6c3988f79fd67c14a1f91e4b1df8a7e806f",
      "tree": "fba9ea601042188ab396e20cb69e98ffe6ff6290",
      "parents": [
        "21befea3720fb847aef5440d507902d8705a671a"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Thu Dec 01 10:02:37 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Thu Dec 01 10:02:37 2011 -0800"
      },
      "message": "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions\n\nChange-Id: I587a5ce259b04c973ed2d7614e874cb74c521aab\nrelated-to-bug: 5696324\n"
    },
    {
      "commit": "2c0dd961d42ad75529a557240ed570f97b237d2f",
      "tree": "0c7af0196b7825ef755512254220874186af4d1b",
      "parents": [
        "cd9e929c8490d1410e6d99c9b54585cb2fea569c",
        "2907dac07c264b45d43b44d304fbe1865bd8c41f"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Nov 30 12:55:39 2011 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Nov 30 12:55:39 2011 -0800"
      },
      "message": "Reconcile with ics-mr1-release\n\nChange-Id: I00b8d5eecea650df527aa3c21bb4a7270a196401\n"
    },
    {
      "commit": "cd9e929c8490d1410e6d99c9b54585cb2fea569c",
      "tree": "0c7af0196b7825ef755512254220874186af4d1b",
      "parents": [
        "ea9d51bd710e6739077a3700f27a1c37767a2f6d",
        "15031854d15ffcc5c955290f61aa59aa09e1fde9"
      ],
      "author": {
        "name": "Jamie Gennis",
        "email": "jgennis@google.com",
        "time": "Wed Nov 30 10:50:49 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Nov 30 10:50:49 2011 -0800"
      },
      "message": "am c040e1e7: am 6f1dd757: Merge \"SurfaceMediaSource: use the vid enc usage bit\" into ics-mr1\n\n* commit \u0027c040e1e77923d81050f2d3dbdac5d07e01be72f6\u0027:\n  SurfaceMediaSource: use the vid enc usage bit\n"
    },
    {
      "commit": "ea9d51bd710e6739077a3700f27a1c37767a2f6d",
      "tree": "bd2df5e1d9f4f5a95976779aa7f73d7e4989c6c3",
      "parents": [
        "37a153f450cb8550fe64a1bf62366cf5e944d6ab",
        "8a1fac32b307cfa096b343f219d471365b657ad8"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Nov 30 09:53:40 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Nov 30 09:53:40 2011 -0800"
      },
      "message": "resolved conflicts for merge of 3d630e86 to master\n\nChange-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e\n"
    },
    {
      "commit": "2907dac07c264b45d43b44d304fbe1865bd8c41f",
      "tree": "d0cf40e356b3fdd74a907275b45f41680287eb3f",
      "parents": [
        "21befea3720fb847aef5440d507902d8705a671a",
        "d748311537c4856433afa6f812945b2c1a1bcb74"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Wed Nov 30 06:46:17 2011 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Wed Nov 30 06:46:17 2011 -0800"
      },
      "message": "merge in ics-mr1-release history after reset to ics-mr1\n"
    },
    {
      "commit": "37a153f450cb8550fe64a1bf62366cf5e944d6ab",
      "tree": "e6437c8c947f3cfb5516c691faeacf46ccfbc47d",
      "parents": [
        "7a3a2b2f9bb9421dcf83fbd47276e57917078aef",
        "d620506220a15177942a8168d09c517740e908d0"
      ],
      "author": {
        "name": "Wu-cheng Li",
        "email": "wuchengli@google.com",
        "time": "Tue Nov 29 18:45:06 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Nov 29 18:45:06 2011 -0800"
      },
      "message": "Merge \"Add camera focus move callback.\""
    },
    {
      "commit": "7a3a2b2f9bb9421dcf83fbd47276e57917078aef",
      "tree": "a60a3d3cd5359bc5a8ee1ac2a2bf95ddf25357de",
      "parents": [
        "8afbf8e07fd1d75dfa0a517267beb6c1fa818027"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Tue Nov 29 17:59:29 2011 -0800"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Tue Nov 29 18:00:03 2011 -0800"
      },
      "message": "Fix the broken build\n\nChange-Id: Ib508514891474d24f14ac69d721b0c9c700a0c3f\n"
    },
    {
      "commit": "15031854d15ffcc5c955290f61aa59aa09e1fde9",
      "tree": "d0cf40e356b3fdd74a907275b45f41680287eb3f",
      "parents": [
        "8a1fac32b307cfa096b343f219d471365b657ad8",
        "21befea3720fb847aef5440d507902d8705a671a"
      ],
      "author": {
        "name": "Jamie Gennis",
        "email": "jgennis@google.com",
        "time": "Tue Nov 29 17:26:32 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Nov 29 17:26:32 2011 -0800"
      },
      "message": "am 6f1dd757: Merge \"SurfaceMediaSource: use the vid enc usage bit\" into ics-mr1\n\n* commit \u00276f1dd757cb158d17c76baeb170f7db2271802ef8\u0027:\n  SurfaceMediaSource: use the vid enc usage bit\n"
    },
    {
      "commit": "21befea3720fb847aef5440d507902d8705a671a",
      "tree": "d0cf40e356b3fdd74a907275b45f41680287eb3f",
      "parents": [
        "7609b2304379fd6d3e5c8d13a34c680441dc48b6",
        "4c57986f963c81fc7c2455deb113c9b32b135468"
      ],
      "author": {
        "name": "Jamie Gennis",
        "email": "jgennis@google.com",
        "time": "Tue Nov 29 17:25:09 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Nov 29 17:25:09 2011 -0800"
      },
      "message": "Merge \"SurfaceMediaSource: use the vid enc usage bit\" into ics-mr1"
    },
    {
      "commit": "8afbf8e07fd1d75dfa0a517267beb6c1fa818027",
      "tree": "12a598f6c9508bd248943bec6bf227bca25c4a3f",
      "parents": [
        "c089d02cf2bddf1bba6eaa2b2fcce149dc44633e",
        "b96d3c5195b148c0d695a326fa9c315561d787ef"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Nov 29 16:33:04 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Nov 29 16:33:04 2011 -0800"
      },
      "message": "am 52607c53: am d12dc284: Merge \"If an error occurs that prevents us from reallocating buffers during a format change\" into ics-mr1\n\n* commit \u002752607c5364446df6ac5b2f55cb50e146e6023a4f\u0027:\n  If an error occurs that prevents us from reallocating buffers during a format change\n"
    },
    {
      "commit": "c089d02cf2bddf1bba6eaa2b2fcce149dc44633e",
      "tree": "b1370ec48d21e9052eb0b040814f91638ebc3a18",
      "parents": [
        "eca36b5a1759970bc3d0373d72d6fec7c9b7e944",
        "6bf045c85526312b198733ac8113cc213c8d79c9"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Nov 29 16:33:02 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Nov 29 16:33:02 2011 -0800"
      },
      "message": "am 074133b2: am 351143fb: Merge \"Updated (internal) API for IStreamSource to signal discontinuities\" into ics-mr1\n\n* commit \u0027074133b260f8d12e484e93b9aa5a33a4983b7349\u0027:\n  Updated (internal) API for IStreamSource to signal discontinuities\n"
    },
    {
      "commit": "eca36b5a1759970bc3d0373d72d6fec7c9b7e944",
      "tree": "b7926335dcc15adaec73e4cfd4b53068c32a74f5",
      "parents": [
        "404a123bed7f180724ead17f10e037b3eb347701",
        "b19386fe52b727524de59a7673b2f56b2e707d51"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Nov 29 15:14:44 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Nov 29 15:14:44 2011 -0800"
      },
      "message": "resolved conflicts for merge of 998a929a to master\n\nChange-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8\n"
    },
    {
      "commit": "8a1fac32b307cfa096b343f219d471365b657ad8",
      "tree": "8cd10d7ed5228247ee71cdf01dd8619ab1ee4999",
      "parents": [
        "b96d3c5195b148c0d695a326fa9c315561d787ef",
        "7609b2304379fd6d3e5c8d13a34c680441dc48b6"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Nov 29 14:12:21 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Nov 29 14:12:21 2011 -0800"
      },
      "message": "am 564fee36: Merge \"Make sure we can properly shutdown even if\" into ics-mr1\n\n* commit \u0027564fee36667e2699c59a29102136220dc2f65862\u0027:\n  Make sure we can properly shutdown even if\n"
    },
    {
      "commit": "b96d3c5195b148c0d695a326fa9c315561d787ef",
      "tree": "a3af410cc5f0990f5caf0bf01fc77702acdfc247",
      "parents": [
        "6bf045c85526312b198733ac8113cc213c8d79c9",
        "5274010d068b05333e3e5544d59ca284802b1a8e"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Nov 29 14:12:20 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Nov 29 14:12:20 2011 -0800"
      },
      "message": "am d12dc284: Merge \"If an error occurs that prevents us from reallocating buffers during a format change\" into ics-mr1\n\n* commit \u0027d12dc28460f622ab29e83fa688ad83a8263e9417\u0027:\n  If an error occurs that prevents us from reallocating buffers during a format change\n"
    },
    {
      "commit": "6bf045c85526312b198733ac8113cc213c8d79c9",
      "tree": "8a757cc879f9a06bf4b13a94d3831a48787871dd",
      "parents": [
        "b19386fe52b727524de59a7673b2f56b2e707d51",
        "544ee287d01d98efbe9eeeaeb7016c8dd55e3748"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Nov 29 14:12:18 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Nov 29 14:12:18 2011 -0800"
      },
      "message": "am 351143fb: Merge \"Updated (internal) API for IStreamSource to signal discontinuities\" into ics-mr1\n\n* commit \u0027351143fb0e2fcfb7dc2ef1045d693c71eb0ea329\u0027:\n  Updated (internal) API for IStreamSource to signal discontinuities\n"
    },
    {
      "commit": "b19386fe52b727524de59a7673b2f56b2e707d51",
      "tree": "001b5d677ee599a4d6f8d1ba636fbf4e5f0c6a4e",
      "parents": [
        "3aadf3a399dc9d14ed85c09c30d4726e2c90536a",
        "6e3d311b6631b12aac2879d1b08c3534aece78b1"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Nov 29 14:10:09 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Nov 29 14:10:09 2011 -0800"
      },
      "message": "am 405a4e34: Merge \"Finer granularity discontinuity support.\" into ics-mr1\n\n* commit \u0027405a4e34032f8a07028138266fe9f79f6753b466\u0027:\n  Finer granularity discontinuity support.\n"
    },
    {
      "commit": "7609b2304379fd6d3e5c8d13a34c680441dc48b6",
      "tree": "8cd10d7ed5228247ee71cdf01dd8619ab1ee4999",
      "parents": [
        "5274010d068b05333e3e5544d59ca284802b1a8e",
        "b58ce9f5e8d0696f9571a94ba5fc05f4500f663f"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Nov 29 14:09:10 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Nov 29 14:09:10 2011 -0800"
      },
      "message": "Merge \"Make sure we can properly shutdown even if\" into ics-mr1"
    },
    {
      "commit": "5274010d068b05333e3e5544d59ca284802b1a8e",
      "tree": "a3af410cc5f0990f5caf0bf01fc77702acdfc247",
      "parents": [
        "544ee287d01d98efbe9eeeaeb7016c8dd55e3748",
        "d3d822204249eaca4259bdf46f6f0357b96e8e21"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Nov 29 14:09:03 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Nov 29 14:09:03 2011 -0800"
      },
      "message": "Merge \"If an error occurs that prevents us from reallocating buffers during a format change\" into ics-mr1"
    },
    {
      "commit": "544ee287d01d98efbe9eeeaeb7016c8dd55e3748",
      "tree": "8a757cc879f9a06bf4b13a94d3831a48787871dd",
      "parents": [
        "6e3d311b6631b12aac2879d1b08c3534aece78b1",
        "bfcc8d8ab7c56bc013bd221a29e1ecf3a6390813"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Nov 29 14:08:45 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Nov 29 14:08:45 2011 -0800"
      },
      "message": "Merge \"Updated (internal) API for IStreamSource to signal discontinuities\" into ics-mr1"
    },
    {
      "commit": "bfcc8d8ab7c56bc013bd221a29e1ecf3a6390813",
      "tree": "0469bc8cc740ad84a42b502ba57e02b3e520748a",
      "parents": [
        "7cafbb32999049873d4746ba83bd20c88abe6ce6"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Nov 29 11:57:35 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Nov 29 11:59:10 2011 -0800"
      },
      "message": "Updated (internal) API for IStreamSource to signal discontinuities\n\nChange-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96\nrelated-to-bug: 5553055\n"
    },
    {
      "commit": "d620506220a15177942a8168d09c517740e908d0",
      "tree": "997518a6958befe0d739f8867f56d63338bd7391",
      "parents": [
        "7c56bb3ac1fb758a222a0c23805704a2789657b6"
      ],
      "author": {
        "name": "Wu-cheng Li",
        "email": "wuchengli@google.com",
        "time": "Mon Nov 14 20:30:14 2011 +0800"
      },
      "committer": {
        "name": "Wu-cheng Li",
        "email": "wuchengli@google.com",
        "time": "Tue Nov 29 14:28:05 2011 +0800"
      },
      "message": "Add camera focus move callback.\n\nbug:5534973\nChange-Id: Iaadcb2738ad040f94849be30ee531326f6199431\n"
    },
    {
      "commit": "6e3d311b6631b12aac2879d1b08c3534aece78b1",
      "tree": "001b5d677ee599a4d6f8d1ba636fbf4e5f0c6a4e",
      "parents": [
        "7cafbb32999049873d4746ba83bd20c88abe6ce6"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Mon Nov 28 12:36:11 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Mon Nov 28 16:45:13 2011 -0800"
      },
      "message": "Finer granularity discontinuity support.\n\nNo clients can signal a format change on either audio or video track (or both)\nand a time discontinuity (timestamps changed) independantly.\n\nChange-Id: I3e6cf4e7c260e85759879d61a9b517f68431c22f\nrelated-to-bug: 5553055\n"
    },
    {
      "commit": "b58ce9f5e8d0696f9571a94ba5fc05f4500f663f",
      "tree": "4c30ef7b134b02bd84cb0d7dc7407c27f5c945a3",
      "parents": [
        "7cafbb32999049873d4746ba83bd20c88abe6ce6"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Mon Nov 28 16:27:35 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Mon Nov 28 16:27:35 2011 -0800"
      },
      "message": "Make sure we can properly shutdown even if\n\na) one of the two decoders has a pending discontinuity\nb) the renderer holds on to all output buffers for that decoder\nc) the renderer is paused\n\nif all three conditions are met the decoder won\u0027t ask for more input data\nand therefore never see the discontinuity.\n\nTo avoid this we briefly resume the renderer just before shutting down.\n\nChange-Id: I9e08af2a1eb4298d1cd00497d6aa33f4ad184e9a\nrelated-to-bug: 5655016\n"
    },
    {
      "commit": "404a123bed7f180724ead17f10e037b3eb347701",
      "tree": "cb569f01c8dd2bca25b44259a25d3b3d11daa0a1",
      "parents": [
        "c9260c15c1e7e2743039c964b8769379a3fff332"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Thu Nov 17 17:48:35 2011 -0800"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Mon Nov 28 15:21:57 2011 -0800"
      },
      "message": "split ComposerService out of SurfaceComposerClient.h\n\nChange-Id: I1eb691f7ca263d5895d871ab675bb5826e0323c6\n"
    },
    {
      "commit": "c9260c15c1e7e2743039c964b8769379a3fff332",
      "tree": "cd829dd370a04344ec40f73c20dff6e8cc8b7793",
      "parents": [
        "926798f8c21ab002d9797ef8973852a2612c1f75",
        "b68a91a70bc8d0d18e7404e14443d4e4020b3635"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Mon Nov 28 14:54:28 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Nov 28 14:54:28 2011 -0800"
      },
      "message": "Merge \"Make AudioTrack a RefBase so wrappers not needed\""
    },
    {
      "commit": "d748311537c4856433afa6f812945b2c1a1bcb74",
      "tree": "c251630c9b785aa555c7093b2691fe1f75b7a6dc",
      "parents": [
        "7cafbb32999049873d4746ba83bd20c88abe6ce6",
        "a1f988df2d273b716fd36f888c228fc94143d237"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Mon Nov 28 12:22:27 2011 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Mon Nov 28 12:22:27 2011 -0800"
      },
      "message": "merge in ics-mr1-release history after reset to ics-mr1\n"
    },
    {
      "commit": "d3d822204249eaca4259bdf46f6f0357b96e8e21",
      "tree": "f48558114991dfd8e267b6c166367cff7353305b",
      "parents": [
        "7cafbb32999049873d4746ba83bd20c88abe6ce6"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Mon Nov 28 10:54:12 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Mon Nov 28 10:54:12 2011 -0800"
      },
      "message": "If an error occurs that prevents us from reallocating buffers during a format change\n\nwe need to transition to executing state anyway to be able to properly flush/shutdown\nin the future.\n\nChange-Id: Ie48bc09ea31942009ae3a5a45aabc9ffad9fb91f\nrelated-to-bug: 5655016\n"
    },
    {
      "commit": "926798f8c21ab002d9797ef8973852a2612c1f75",
      "tree": "543f4c16724237f2944b75c0228f98ba9251ae39",
      "parents": [
        "1d2ad70cb27c16709ebd74ae651c47f57abfedb0",
        "3aadf3a399dc9d14ed85c09c30d4726e2c90536a"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Nov 23 12:35:01 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Nov 23 12:35:01 2011 -0800"
      },
      "message": "am f6422f5f: am 20398fac: Merge \"audioflinger: reduce sleep time to avoid underrun\" into ics-mr1\n\n* commit \u0027f6422f5f5d04aab47f8f36a0ea92e2140bed0105\u0027:\n  audioflinger: reduce sleep time to avoid underrun\n"
    },
    {
      "commit": "3aadf3a399dc9d14ed85c09c30d4726e2c90536a",
      "tree": "c251630c9b785aa555c7093b2691fe1f75b7a6dc",
      "parents": [
        "a0c986cc09531e208af17e62ea6f0f47841705cc",
        "7cafbb32999049873d4746ba83bd20c88abe6ce6"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Nov 23 12:32:53 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Nov 23 12:32:53 2011 -0800"
      },
      "message": "am 20398fac: Merge \"audioflinger: reduce sleep time to avoid underrun\" into ics-mr1\n\n* commit \u002720398fac99ff78cb3ec3dd122930e45d409e0524\u0027:\n  audioflinger: reduce sleep time to avoid underrun\n"
    },
    {
      "commit": "7cafbb32999049873d4746ba83bd20c88abe6ce6",
      "tree": "c251630c9b785aa555c7093b2691fe1f75b7a6dc",
      "parents": [
        "e933cb5ae546d023ab756391a135c170874e7901"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Nov 22 18:50:29 2011 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Nov 22 18:50:29 2011 -0800"
      },
      "message": "audioflinger: reduce sleep time to avoid underrun\n\nProgressively reduce the sleep time applied in MixerThread::threadLoop()\nin case of consecutive application underruns to avoid starving the audio HAL.\nAs the default sleep time is longer than the duration of an audio buffer\nwe ended up writing less data than needed by the audio HAL if\nthe condition persisted.\n\nIssue 5553055.\n\nChange-Id: I2b23ee79c032efa945025db228beaecd1e07a2e5\n"
    },
    {
      "commit": "1d2ad70cb27c16709ebd74ae651c47f57abfedb0",
      "tree": "16b72ad09b41e4541cc541299da992773bec9724",
      "parents": [
        "8c3ddf9442d04cf19dba88381fbbb53d587d5979",
        "0e0c3220ee1c4d57765e2cba3b07923921c55e08"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Tue Nov 22 17:36:45 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Nov 22 17:36:45 2011 -0800"
      },
      "message": "Merge \"Fix a subtitle bug: multiple blank lines in SubRip(srt) file.\""
    },
    {
      "commit": "8c3ddf9442d04cf19dba88381fbbb53d587d5979",
      "tree": "ddf16b552a96e4e454ca8be149e5a1552ffa53d0",
      "parents": [
        "a7e4865306b72e8eb97ee73719c897c432c53a0c",
        "a1f988df2d273b716fd36f888c228fc94143d237"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Nov 22 13:25:45 2011 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Nov 22 13:25:45 2011 -0800"
      },
      "message": "Reconcile with ics-mr0-release ics-mr1-release\n\nChange-Id: I3200e581a74858b3b7728db974f10c2ed68004ad\n"
    },
    {
      "commit": "a1f988df2d273b716fd36f888c228fc94143d237",
      "tree": "8f79a2e61ce7f69d24918e19d7a232ff12b252b3",
      "parents": [
        "6f5cc45c48c02173bfae8d54b54a92c9bae256a1",
        "aaa12ed10abb5d8ed6a1a939885114d1c87c9b7c"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Tue Nov 22 11:56:20 2011 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Tue Nov 22 11:56:20 2011 -0800"
      },
      "message": "merge in ics-mr1-release history after reset to ics-mr1\n"
    },
    {
      "commit": "a7e4865306b72e8eb97ee73719c897c432c53a0c",
      "tree": "ddf16b552a96e4e454ca8be149e5a1552ffa53d0",
      "parents": [
        "7c56bb3ac1fb758a222a0c23805704a2789657b6",
        "a0c986cc09531e208af17e62ea6f0f47841705cc"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Nov 22 08:43:28 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Nov 22 08:43:28 2011 -0800"
      },
      "message": "am 31626b30: am cb6fbc89: Merge \"Report a runtime error instead of asserting on malformed avc configuration data.\" into ics-mr1\n\n* commit \u002731626b3075335f4cf579342e99436bb45870cf55\u0027:\n  Report a runtime error instead of asserting on malformed avc configuration data.\n"
    },
    {
      "commit": "a0c986cc09531e208af17e62ea6f0f47841705cc",
      "tree": "4a538f125f876469ea59e173b9d3645000c91cd4",
      "parents": [
        "88b00e9b79a0242251435b399971be4ca9738395",
        "e933cb5ae546d023ab756391a135c170874e7901"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Nov 22 08:41:04 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Nov 22 08:41:04 2011 -0800"
      },
      "message": "am cb6fbc89: Merge \"Report a runtime error instead of asserting on malformed avc configuration data.\" into ics-mr1\n\n* commit \u0027cb6fbc89c25298643ab342b4a228e772b0e56978\u0027:\n  Report a runtime error instead of asserting on malformed avc configuration data.\n"
    },
    {
      "commit": "e933cb5ae546d023ab756391a135c170874e7901",
      "tree": "4a538f125f876469ea59e173b9d3645000c91cd4",
      "parents": [
        "e8e5f86e9e310b065596c8cbbca1543eb833dee1",
        "71b61a960ae30df990976ca5dbe780d85a15b0d1"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Nov 22 08:39:11 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Nov 22 08:39:11 2011 -0800"
      },
      "message": "Merge \"Report a runtime error instead of asserting on malformed avc configuration data.\" into ics-mr1"
    },
    {
      "commit": "0e0c3220ee1c4d57765e2cba3b07923921c55e08",
      "tree": "579d94e25dd5733d046a98bfe99781431dbd8676",
      "parents": [
        "7c56bb3ac1fb758a222a0c23805704a2789657b6"
      ],
      "author": {
        "name": "Insun Kang",
        "email": "insun@google.com",
        "time": "Tue Nov 22 20:59:31 2011 +0900"
      },
      "committer": {
        "name": "Insun Kang",
        "email": "insun@google.com",
        "time": "Tue Nov 22 21:11:49 2011 +0900"
      },
      "message": "Fix a subtitle bug: multiple blank lines in SubRip(srt) file.\n\nTimedTextParser should handle multiple blank lines between subtitles\nin SRT format.\n\nChange-Id: Id81e0a14d9984141f68b9f0919942c85562301b3\n"
    },
    {
      "commit": "7c56bb3ac1fb758a222a0c23805704a2789657b6",
      "tree": "9eadb09e607c361c36f37218f8121433eaff2574",
      "parents": [
        "c637289fdfbea45a322601ce74f743595c477339",
        "88b00e9b79a0242251435b399971be4ca9738395"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Mon Nov 21 21:08:55 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Nov 21 21:08:55 2011 -0800"
      },
      "message": "am d0a25456: am 02740dc4: Merge \"Fix log spamming during time lapse video recording\" into ics-mr1\n\n* commit \u0027d0a254566f5f0be5607b4d64839a575c888c94f6\u0027:\n  Fix log spamming during time lapse video recording\n"
    },
    {
      "commit": "88b00e9b79a0242251435b399971be4ca9738395",
      "tree": "9093e89f8a7bf9544061fdfbe52383ae314e28b4",
      "parents": [
        "26900df26fe5b55ddc804df097162ffbd9b81d0a",
        "e8e5f86e9e310b065596c8cbbca1543eb833dee1"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Mon Nov 21 20:29:59 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Nov 21 20:29:59 2011 -0800"
      },
      "message": "am 02740dc4: Merge \"Fix log spamming during time lapse video recording\" into ics-mr1\n\n* commit \u002702740dc49df86fc94c872454aa9db98737d5e8c8\u0027:\n  Fix log spamming during time lapse video recording\n"
    },
    {
      "commit": "4c57986f963c81fc7c2455deb113c9b32b135468",
      "tree": "a7c275b861fd66017002efa82eb25e08e096f652",
      "parents": [
        "6f5cc45c48c02173bfae8d54b54a92c9bae256a1"
      ],
      "author": {
        "name": "Jamie Gennis",
        "email": "jgennis@google.com",
        "time": "Mon Nov 21 16:51:47 2011 -0800"
      },
      "committer": {
        "name": "Jamie Gennis",
        "email": "jgennis@google.com",
        "time": "Mon Nov 21 17:48:19 2011 -0800"
      },
      "message": "SurfaceMediaSource: use the vid enc usage bit\n\nThis change makes SurfaceMediaSource add the VIDEO_ENC usage bit when\nallocating its GraphicBuffers rather than the HW_TEXTURE bit.\n\nChange-Id: Ie20e225c894fdbc31cad6bb82b3b64c7e98074eb\n"
    },
    {
      "commit": "e8e5f86e9e310b065596c8cbbca1543eb833dee1",
      "tree": "9093e89f8a7bf9544061fdfbe52383ae314e28b4",
      "parents": [
        "6f5cc45c48c02173bfae8d54b54a92c9bae256a1"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Sun Nov 20 09:45:44 2011 -0800"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Mon Nov 21 12:09:51 2011 -0800"
      },
      "message": "Fix log spamming during time lapse video recording\n\nChange-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f\n\nrelated-to-bug: 5626569\n"
    },
    {
      "commit": "c637289fdfbea45a322601ce74f743595c477339",
      "tree": "ba93f0ab66c0387e0fb71beb3813d357c571d1f7",
      "parents": [
        "7383d41aa2821544efaf55d57ff55ac5358a8a19",
        "aaa12ed10abb5d8ed6a1a939885114d1c87c9b7c"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Nov 18 15:42:32 2011 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Nov 18 15:42:32 2011 -0800"
      },
      "message": "Reconcile with ics-mr0-release ics-mr1-release\n\nChange-Id: I31643242d240b4d1efef685583ec21934a88cc02\n"
    },
    {
      "commit": "7383d41aa2821544efaf55d57ff55ac5358a8a19",
      "tree": "ba93f0ab66c0387e0fb71beb3813d357c571d1f7",
      "parents": [
        "153cefdf4acab25355f590d7760ebf73ef6096a9",
        "26900df26fe5b55ddc804df097162ffbd9b81d0a"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Nov 18 15:35:00 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Nov 18 15:35:00 2011 -0800"
      },
      "message": "am a1cd09e0: am 7ff7821a: am d4b22ab4: status_t !\u003d bool\n\n* commit \u0027a1cd09e0e6a239eafa5112c0e8a09b7efc154a78\u0027:\n  status_t !\u003d bool\n"
    },
    {
      "commit": "26900df26fe5b55ddc804df097162ffbd9b81d0a",
      "tree": "8f79a2e61ce7f69d24918e19d7a232ff12b252b3",
      "parents": [
        "7f2bec1f9b8acc105a5779b18ab180dbe59a1b00",
        "6f5cc45c48c02173bfae8d54b54a92c9bae256a1"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Nov 18 15:10:54 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Nov 18 15:10:54 2011 -0800"
      },
      "message": "am 7ff7821a: am d4b22ab4: status_t !\u003d bool\n\n* commit \u00277ff7821a601a39fffb318e29873957b4a3703c46\u0027:\n  status_t !\u003d bool\n"
    },
    {
      "commit": "6f5cc45c48c02173bfae8d54b54a92c9bae256a1",
      "tree": "8f79a2e61ce7f69d24918e19d7a232ff12b252b3",
      "parents": [
        "6479b955d21707609eae70008cf7956dddf12371",
        "91e2c7d2988c4947aca8a637f88a2179d905b970"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Nov 18 15:07:21 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Nov 18 15:07:21 2011 -0800"
      },
      "message": "am d4b22ab4: status_t !\u003d bool\n\n* commit \u0027d4b22ab4889f9b1885bfc0dc45667c846a171a98\u0027:\n  status_t !\u003d bool\n"
    },
    {
      "commit": "91e2c7d2988c4947aca8a637f88a2179d905b970",
      "tree": "d73196fde1d16c5dbc71ca1f2b064db3883785d7",
      "parents": [
        "fd8f534c7389e8215671a36a02c4666321f8816d"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Nov 18 13:10:56 2011 -0800"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Nov 18 14:21:34 2011 -0800"
      },
      "message": "status_t !\u003d bool\n\nb/5567433\n\nChange-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e\n"
    },
    {
      "commit": "153cefdf4acab25355f590d7760ebf73ef6096a9",
      "tree": "ba93f0ab66c0387e0fb71beb3813d357c571d1f7",
      "parents": [
        "0c5ce9b35aa34688bca86b93beee743b6ff250df"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Nov 18 13:10:56 2011 -0800"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Nov 18 13:10:56 2011 -0800"
      },
      "message": "status_t !\u003d bool\n\nb/5567433\n\nChange-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e\n"
    },
    {
      "commit": "71b61a960ae30df990976ca5dbe780d85a15b0d1",
      "tree": "b8a9826f9287872f217be9cbb8d48b18ad2b234d",
      "parents": [
        "6479b955d21707609eae70008cf7956dddf12371"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Fri Nov 18 12:22:59 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Fri Nov 18 12:22:59 2011 -0800"
      },
      "message": "Report a runtime error instead of asserting on malformed avc configuration data.\n\nChange-Id: Ibcd9c3fb5b6532eba843ed80ecdcdacaf50d8845\nrelated-to-bug: 5641069\n"
    },
    {
      "commit": "0c5ce9b35aa34688bca86b93beee743b6ff250df",
      "tree": "9d0d0f330ebe704bb34d8dd28ad93d8608b51e70",
      "parents": [
        "60047ae30cc816e98ddb4b0b48e58c34c3d1f486",
        "c23e2f2464eb3748599d47af7d8986b856f3c179"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Nov 17 14:08:31 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Nov 17 14:08:31 2011 -0800"
      },
      "message": "Merge \"Bug 5522189 re-enable ARM opts but disable inline\""
    },
    {
      "commit": "c23e2f2464eb3748599d47af7d8986b856f3c179",
      "tree": "e1d10d95ab838f97307feaf5a3a0f7f99526a80b",
      "parents": [
        "1de4e2e1d7c22a31238e448200cbbe667cd5fa4c"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Nov 17 13:27:22 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Nov 17 13:27:22 2011 -0800"
      },
      "message": "Bug 5522189 re-enable ARM opts but disable inline\n\nPIE did not work together with inlining.  This change combines (almost\nall of) the performance benefits of ARM optimizations together with PIE.\n\nChange-Id: I4594d33ae5a0a7bac327ae08e30fb35343a06256\n"
    },
    {
      "commit": "60047ae30cc816e98ddb4b0b48e58c34c3d1f486",
      "tree": "6bbd2fd26a30192dd319f1a1ea93cb7ecdd545ed",
      "parents": [
        "1de4e2e1d7c22a31238e448200cbbe667cd5fa4c",
        "7f2bec1f9b8acc105a5779b18ab180dbe59a1b00"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Thu Nov 17 13:20:16 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Nov 17 13:20:16 2011 -0800"
      },
      "message": "am 624efe45: am c1b1709b: Merge \"Make sure not to cancel pending seek/EOS notifications on a cache underrun...\" into ics-mr1\n\n* commit \u0027624efe45671131903fb5165f6133ba39486092ab\u0027:\n  Make sure not to cancel pending seek/EOS notifications on a cache underrun...\n"
    }
  ],
  "next": "7f2bec1f9b8acc105a5779b18ab180dbe59a1b00"
}
