)]}'
{
  "log": [
    {
      "commit": "ffaee8a4c3d99342445c92254c42160512583180",
      "tree": "76a6265c319df75e94b4fd6d8a5d51e194f0ce5f",
      "parents": [
        "1c3913cf94572c4bfa2c6f7a98925787c5499b69",
        "b408222bd9479c291874b607acae1425d6154fe7"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Thu Jan 20 17:14:59 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Jan 20 17:14:59 2011 -0800"
      },
      "message": "am c4f82e33: Merge \"Implement missing pause/resume support for NuPlayer.\" into honeycomb\n\n* commit \u0027c4f82e3387429ae94e4874b7dc1649b3c643b505\u0027:\n  Implement missing pause/resume support for NuPlayer.\n"
    },
    {
      "commit": "1c3913cf94572c4bfa2c6f7a98925787c5499b69",
      "tree": "05715c76738dffbbf694b8ad4c7b62aa819a880b",
      "parents": [
        "87b0438aed11ed7f5e7cc442a5300eb5f20ebdc5",
        "adde7faabd165ebf69eaf64f62eb6792032a350a"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Thu Jan 20 17:03:46 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Jan 20 17:03:46 2011 -0800"
      },
      "message": "am a423d868: Merge \"clean-up unneeded code\" into honeycomb\n\n* commit \u0027a423d868009b9961597365ce7f190aef23f4b1cc\u0027:\n  clean-up unneeded code\n"
    },
    {
      "commit": "b408222bd9479c291874b607acae1425d6154fe7",
      "tree": "3d9ed699c5082bbf6449e623290ca59ce3b7a64d",
      "parents": [
        "adde7faabd165ebf69eaf64f62eb6792032a350a"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Thu Jan 20 15:23:04 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Thu Jan 20 15:23:04 2011 -0800"
      },
      "message": "Implement missing pause/resume support for NuPlayer.\n\nChange-Id: Ia3f1ce521dd4b70e134ef03aa7c9db8e8d39a134\nrelated-to-bug: 2368598\n"
    },
    {
      "commit": "adde7faabd165ebf69eaf64f62eb6792032a350a",
      "tree": "7e03e923ddcde1792d8525a2d308bd01031e25a3",
      "parents": [
        "da00f9c4b83fbb0076d5cadbfca76097cb22086c",
        "9383d1a2197479e4d2ac4571c7fbe424f93e3b93"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Thu Jan 20 12:25:26 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Jan 20 12:25:26 2011 -0800"
      },
      "message": "Merge \"clean-up unneeded code\" into honeycomb"
    },
    {
      "commit": "9383d1a2197479e4d2ac4571c7fbe424f93e3b93",
      "tree": "cbe9c93cd1adf5561c007dc5719a69ca3607b53f",
      "parents": [
        "91a685f1eaa32cadb461755fb235239b308953c9"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Wed Jan 19 18:02:20 2011 -0800"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Thu Jan 20 12:10:11 2011 -0800"
      },
      "message": "clean-up unneeded code\n\nnow that we removed the notion of a \"inUse\" buffer in surfaceflinger\na lot of code can be simplified / removed.\n\nnoteworthy, the whole concept of \"unlockClient\" wrt. \"compositionComplete\"\nis also gone.\n\nChange-Id: I210413d4c8c0998dae05c8620ebfc895d3e6233d\n"
    },
    {
      "commit": "87b0438aed11ed7f5e7cc442a5300eb5f20ebdc5",
      "tree": "b774edcdf237529f1c1e851bbc624c495c57c510",
      "parents": [
        "48086f7b1d7c48bc849118b0203f4fb983334ce3",
        "da00f9c4b83fbb0076d5cadbfca76097cb22086c"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Jan 20 10:33:29 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Jan 20 10:33:29 2011 -0800"
      },
      "message": "am 404946fc: Merge \"Fix issue 3371096.\" into honeycomb\n\n* commit \u0027404946fc260e5dff23c8a0db12e33ff842ab4b47\u0027:\n  Fix issue 3371096.\n"
    },
    {
      "commit": "da00f9c4b83fbb0076d5cadbfca76097cb22086c",
      "tree": "c90ac3a883cc0fca45d0e5d9c1ec730c1e2045a7",
      "parents": [
        "737be0d7937e5ab61f0ddb8db1f3835f171300f1",
        "73337489229cc9b50371c7a9fcd86e9f00ea46d0"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Jan 20 10:31:21 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Jan 20 10:31:21 2011 -0800"
      },
      "message": "Merge \"Fix issue 3371096.\" into honeycomb"
    },
    {
      "commit": "48086f7b1d7c48bc849118b0203f4fb983334ce3",
      "tree": "48b6bc71b558aee49fedc2319d0607209d7da88e",
      "parents": [
        "5cc52d46226bf1ab6faa8910413153c0b86dc5c9",
        "737be0d7937e5ab61f0ddb8db1f3835f171300f1"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Thu Jan 20 09:28:55 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Jan 20 09:28:55 2011 -0800"
      },
      "message": "am 637739d4: Merge \"Eliminate recording sound by starting the video track before audio track.\" into honeycomb\n\n* commit \u0027637739d4bf014e82af19ec4465e6031579ca6eea\u0027:\n  Eliminate recording sound by starting the video track before audio track.\n"
    },
    {
      "commit": "737be0d7937e5ab61f0ddb8db1f3835f171300f1",
      "tree": "f93f621fbd413757bf1a6489995a40ca0e0d866f",
      "parents": [
        "91a685f1eaa32cadb461755fb235239b308953c9",
        "7bd460110b27a979384dda351788eac95d8467f5"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Thu Jan 20 09:27:01 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Jan 20 09:27:01 2011 -0800"
      },
      "message": "Merge \"Eliminate recording sound by starting the video track before audio track.\" into honeycomb"
    },
    {
      "commit": "7bd460110b27a979384dda351788eac95d8467f5",
      "tree": "cd228aa4d17773047de7bcc1976892bcb979a229",
      "parents": [
        "886c09ee81eb7b8878e487c7f801ea8ddb27c17c"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 19 20:42:19 2011 -0800"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Thu Jan 20 06:58:16 2011 -0800"
      },
      "message": "Eliminate recording sound by starting the video track before audio track.\n\nDue to the variable delays in the system, the recording sound can still be heard\nif the audio track is started early. This happens even after we suppress a relative\nlong period of initial audio for a recording session. By starting the video track\nbefore the audio track, we effectively play the recording sound earlier.\n\nbug - 3371141\n\nChange-Id: I2cccf77eae953d96827fc080c618b1d962445c26\n"
    },
    {
      "commit": "73337489229cc9b50371c7a9fcd86e9f00ea46d0",
      "tree": "59fcf0e06094891a67e52540d735e59c48b1517d",
      "parents": [
        "662cb2487ed513ff3ac26b104b5715c01d78419c"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Jan 19 18:36:13 2011 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Jan 19 18:36:13 2011 -0800"
      },
      "message": "Fix issue 3371096.\n\nEffectModule::process() was copying effect chain input buffer to\noutput buffer if no effect was active instead of accumulating it.\n\nChange-Id: I2838af2e7b6654d0a76547625929a5453da68d02\n"
    },
    {
      "commit": "5cc52d46226bf1ab6faa8910413153c0b86dc5c9",
      "tree": "8f369f30d2ff5d39db2ceaca042f0bf917cb6df9",
      "parents": [
        "f16e4df61fb5482adffa1a541de985c48506ff28",
        "91a685f1eaa32cadb461755fb235239b308953c9"
      ],
      "author": {
        "name": "Gloria Wang",
        "email": "gwang@google.com",
        "time": "Wed Jan 19 15:59:13 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 19 15:59:13 2011 -0800"
      },
      "message": "am a4b0cdc9: Merge \"More fix for 64 bit offset.\" into honeycomb\n\n* commit \u0027a4b0cdc96e309168517f4b4da24b7647668f99a7\u0027:\n  More fix for 64 bit offset.\n"
    },
    {
      "commit": "91a685f1eaa32cadb461755fb235239b308953c9",
      "tree": "271144ed0b6a7df45d55468a6002b2d903b192af",
      "parents": [
        "1c705e94c291897d23d236a7d118a68eace74406",
        "2ed8a921ef55aa2f3dd4b7ac33b7ded6ec33d92d"
      ],
      "author": {
        "name": "Gloria Wang",
        "email": "gwang@google.com",
        "time": "Wed Jan 19 15:57:23 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Jan 19 15:57:23 2011 -0800"
      },
      "message": "Merge \"More fix for 64 bit offset.\" into honeycomb"
    },
    {
      "commit": "2ed8a921ef55aa2f3dd4b7ac33b7ded6ec33d92d",
      "tree": "df7cad524492b9f7f54daddd99bf1626ba89bed4",
      "parents": [
        "886c09ee81eb7b8878e487c7f801ea8ddb27c17c"
      ],
      "author": {
        "name": "Gloria Wang",
        "email": "gwang@google.com",
        "time": "Wed Jan 19 15:38:16 2011 -0800"
      },
      "committer": {
        "name": "Gloria Wang",
        "email": "gwang@google.com",
        "time": "Wed Jan 19 15:38:16 2011 -0800"
      },
      "message": "More fix for 64 bit offset.\n\nChange-Id: Ia05060113ca0f43a4362914dc99c89c89e30eb4a\n"
    },
    {
      "commit": "f16e4df61fb5482adffa1a541de985c48506ff28",
      "tree": "87f6ecb9f017a00d7dc67aca6a7dcc520269fbe0",
      "parents": [
        "cafbd578dcff2bcbe025b2757f9a163f2b8a5398",
        "1c705e94c291897d23d236a7d118a68eace74406"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 19 15:24:28 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 19 15:24:28 2011 -0800"
      },
      "message": "am 3cd6302b: Merge \"Prefill the cache before trying to instantiate the media extractor.\" into honeycomb\n\n* commit \u00273cd6302b9e54ff888df5eb47b35d25e7dac1d763\u0027:\n  Prefill the cache before trying to instantiate the media extractor.\n"
    },
    {
      "commit": "1c705e94c291897d23d236a7d118a68eace74406",
      "tree": "3b7604c65dba8ecd02ea946b1665a51e8d4fa4c8",
      "parents": [
        "886c09ee81eb7b8878e487c7f801ea8ddb27c17c",
        "ac05c317cd818701535c5d72ce90da98c4bae75b"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 19 15:12:41 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Jan 19 15:12:41 2011 -0800"
      },
      "message": "Merge \"Prefill the cache before trying to instantiate the media extractor.\" into honeycomb"
    },
    {
      "commit": "ac05c317cd818701535c5d72ce90da98c4bae75b",
      "tree": "7bc60e7bca5d17cad542d96782ad828a0df0c258",
      "parents": [
        "88b7ad413c4b6d08697069b18488641d6ce31fd3"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 19 15:07:19 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 19 15:07:19 2011 -0800"
      },
      "message": "Prefill the cache before trying to instantiate the media extractor.\n\nThe latter is an operation that otherwise could block on the datasource\nfor a significant amount of time. During that time we\u0027d be unable to\nabort the preparation phase without this prefill.\n\nChange-Id: Ia42496d88a11314386ea8797d665bf4e94871e30\nrelated-to-bug: 3362836\n"
    },
    {
      "commit": "cafbd578dcff2bcbe025b2757f9a163f2b8a5398",
      "tree": "aded59127bc298021982734aefc0a340277e33cd",
      "parents": [
        "d049c605e68163aa01633dd76b4cc12c95cca5c5",
        "886c09ee81eb7b8878e487c7f801ea8ddb27c17c"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 19 13:59:02 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 19 13:59:02 2011 -0800"
      },
      "message": "am fc37018a: Merge \"Logging the duration range from different media tracks for recording\" into honeycomb\n\n* commit \u0027fc37018a9040f9b0f7cf4dac6d6fc5a5bdd6c287\u0027:\n  Logging the duration range from different media tracks for recording\n"
    },
    {
      "commit": "886c09ee81eb7b8878e487c7f801ea8ddb27c17c",
      "tree": "395f9c04fc4728c74c700d4ac87113a434156521",
      "parents": [
        "88b7ad413c4b6d08697069b18488641d6ce31fd3",
        "65b3d76025c71d755b0fb3b6ead90255f25417ed"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 19 13:57:06 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Jan 19 13:57:06 2011 -0800"
      },
      "message": "Merge \"Logging the duration range from different media tracks for recording\" into honeycomb"
    },
    {
      "commit": "d049c605e68163aa01633dd76b4cc12c95cca5c5",
      "tree": "a2f5673618e9356ae82526216272ea65bb9b9d58",
      "parents": [
        "6bfb9ea1529f2823c79df3e4ae83453dfa888fc4",
        "88b7ad413c4b6d08697069b18488641d6ce31fd3"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 19 11:59:14 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 19 11:59:14 2011 -0800"
      },
      "message": "am 0353459d: Merge \"Always revert to the previous bandwidth if the required sequence number cannot be found\" into honeycomb\n\n* commit \u00270353459d405e20750b3ddd8abad83eace1ed2a39\u0027:\n  Always revert to the previous bandwidth if the required sequence number cannot be found\n"
    },
    {
      "commit": "65b3d76025c71d755b0fb3b6ead90255f25417ed",
      "tree": "718d9853ea27847b77c0cf5c739ed6aba1b9d13b",
      "parents": [
        "88b348910a607ae399bcd693dd42a231d98da2c9"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 19 11:50:19 2011 -0800"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 19 11:54:59 2011 -0800"
      },
      "message": "Logging the duration range from different media tracks for recording\n\nChange-Id: I8c3edcf97ce35301f8645e4a1e232d9bfc2c0349\n"
    },
    {
      "commit": "6bfb9ea1529f2823c79df3e4ae83453dfa888fc4",
      "tree": "b31808b67b8630b746bf56c12e9cf5b30bf1b139",
      "parents": [
        "d64d62616048f733bc3034249e56641164528f05",
        "88b348910a607ae399bcd693dd42a231d98da2c9"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 19 11:33:56 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 19 11:33:56 2011 -0800"
      },
      "message": "am 71bb6a2a: Merge \"Return a runtime error if decryption fails instead of asserting.\" into honeycomb\n\n* commit \u002771bb6a2a3eb668fe7459cd8fff1f65a15804c3be\u0027:\n  Return a runtime error if decryption fails instead of asserting.\n"
    },
    {
      "commit": "88b7ad413c4b6d08697069b18488641d6ce31fd3",
      "tree": "36d49e5cf69bbf5b513bcffd2f94ff4c40f35578",
      "parents": [
        "88b348910a607ae399bcd693dd42a231d98da2c9"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 19 11:30:43 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 19 11:30:43 2011 -0800"
      },
      "message": "Always revert to the previous bandwidth if the required sequence number cannot be found\n\nChange-Id: I098dba37f4a70fc703c9ce65346907c3e10f27f6\n"
    },
    {
      "commit": "88b348910a607ae399bcd693dd42a231d98da2c9",
      "tree": "25c690dee1142a36924392b7899e447f663129f7",
      "parents": [
        "662cb2487ed513ff3ac26b104b5715c01d78419c"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 19 11:24:39 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 19 11:24:39 2011 -0800"
      },
      "message": "Return a runtime error if decryption fails instead of asserting.\n\nChange-Id: Ibab7f2cae3ff7a2e19bc3f31005d5059775a664a\n"
    },
    {
      "commit": "d64d62616048f733bc3034249e56641164528f05",
      "tree": "fa540b83f1461d7ba9d72b64ce44ad0698118161",
      "parents": [
        "a027eaf8b23118354ffef89b40cc36bf93f1c769",
        "662cb2487ed513ff3ac26b104b5715c01d78419c"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 19 10:40:19 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 19 10:40:19 2011 -0800"
      },
      "message": "am 069ee21a: Merge \"Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.\" into honeycomb\n\n* commit \u0027069ee21a2012e0b6fd355253ea81a84ea11138d2\u0027:\n  Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.\n"
    },
    {
      "commit": "662cb2487ed513ff3ac26b104b5715c01d78419c",
      "tree": "d4036f117ab08f04bccc46313fde7e5bbf98454a",
      "parents": [
        "113a95462d2018c62b9e6bc86e7f643ff46f29cf",
        "b391290130f263441334ee4525a5832f0bea2ef0"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 19 10:38:16 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Jan 19 10:38:16 2011 -0800"
      },
      "message": "Merge \"Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.\" into honeycomb"
    },
    {
      "commit": "b391290130f263441334ee4525a5832f0bea2ef0",
      "tree": "09faabdbb6c75ef535bc134eb6dad53267f66380",
      "parents": [
        "7509d7725207bfc28f7757c18518e21110c0736d"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 19 10:34:52 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 19 10:34:52 2011 -0800"
      },
      "message": "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.\n\nRefactor the logic a little.\n\nChange-Id: Idd7a26678d846c96b0b11f096305e7467381bda3\n"
    },
    {
      "commit": "a027eaf8b23118354ffef89b40cc36bf93f1c769",
      "tree": "4e6ce5b95e04ee95ddd52a04585ced0290fac933",
      "parents": [
        "a5939efeaf8be373ee71941466ad5a2db1750881",
        "113a95462d2018c62b9e6bc86e7f643ff46f29cf"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 19 10:31:06 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 19 10:31:06 2011 -0800"
      },
      "message": "am 8e7d6263: Merge \"Expose average video frame rate via MPEG4Extractor\" into honeycomb\n\n* commit \u00278e7d626385eef104d52aa9080b70395ca840a0cd\u0027:\n  Expose average video frame rate via MPEG4Extractor\n"
    },
    {
      "commit": "113a95462d2018c62b9e6bc86e7f643ff46f29cf",
      "tree": "136c2efa65fdbbb1d4057e9aaf9ec6dbc66e4ae9",
      "parents": [
        "e75ceba6e3f009118c5debbbe2de268beb350c9a"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 19 00:13:55 2011 -0800"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 19 10:20:59 2011 -0800"
      },
      "message": "Expose average video frame rate via MPEG4Extractor\n\nbug - 3362483\n\nChange-Id: Ifcbb75c1e8b80cb06c4b8fe7f5ff99bc6f18af69\n"
    },
    {
      "commit": "a5939efeaf8be373ee71941466ad5a2db1750881",
      "tree": "608b74b25dd64936ede778ea8449c21d7683e14e",
      "parents": [
        "aa46ce8ac441981ecbf9e72fb4acc6677615efc9",
        "e75ceba6e3f009118c5debbbe2de268beb350c9a"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 19 10:06:23 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 19 10:06:23 2011 -0800"
      },
      "message": "am 4061c9aa: Merge \"Fix the presentation video resolution when it is different from the actual image resolution of the video.\" into honeycomb\n\n* commit \u00274061c9aa6d77bd7ad3b43d898b3e55fd62f57f18\u0027:\n  Fix the presentation video resolution when it is different from the actual image resolution of the video.\n"
    },
    {
      "commit": "e75ceba6e3f009118c5debbbe2de268beb350c9a",
      "tree": "060dc1df2f38a7d1c031af49db48ea58ea4b258f",
      "parents": [
        "7509d7725207bfc28f7757c18518e21110c0736d",
        "b45c01c2b8588ff431b511151666a55a39f0a6ae"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 19 10:05:05 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Jan 19 10:05:05 2011 -0800"
      },
      "message": "Merge \"Fix the presentation video resolution when it is different from the actual image resolution of the video.\" into honeycomb"
    },
    {
      "commit": "aa46ce8ac441981ecbf9e72fb4acc6677615efc9",
      "tree": "df692b18c7892879bff2c3144e03008a859094b2",
      "parents": [
        "09ad2d8994ac770f60607dc3b1c848531ce076e9",
        "7509d7725207bfc28f7757c18518e21110c0736d"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 19 09:51:42 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 19 09:51:42 2011 -0800"
      },
      "message": "am 2597aedb: Merge \"Turn another assertion into a runtime error. Damn you surfaces.\" into honeycomb\n\n* commit \u00272597aedb3869e46f945359c529e03263c77a944d\u0027:\n  Turn another assertion into a runtime error. Damn you surfaces.\n"
    },
    {
      "commit": "7509d7725207bfc28f7757c18518e21110c0736d",
      "tree": "1af0f48a1b15b6c5b41ab2500319c9337f781e75",
      "parents": [
        "a91992013f26cd6ad293d3599c13601e0df7994d",
        "018761c5cc4aefd0495eaa4666f2372a59a7980a"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 19 09:49:32 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Jan 19 09:49:32 2011 -0800"
      },
      "message": "Merge \"Turn another assertion into a runtime error. Damn you surfaces.\" into honeycomb"
    },
    {
      "commit": "09ad2d8994ac770f60607dc3b1c848531ce076e9",
      "tree": "dd1ecb335e254f0ad53f80e54f7d74640cbe5628",
      "parents": [
        "f6e3b6d3f097fca569dad806de426a4c6af5200c",
        "a91992013f26cd6ad293d3599c13601e0df7994d"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Jan 19 09:43:17 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 19 09:43:17 2011 -0800"
      },
      "message": "am 42466b1c: Merge \"Tentative fix for issue 3362362.\" into honeycomb\n\n* commit \u002742466b1cad4cec1aa746809dfcca702456415be4\u0027:\n  Tentative fix for issue 3362362.\n"
    },
    {
      "commit": "a91992013f26cd6ad293d3599c13601e0df7994d",
      "tree": "8312375d23706456f098db189ac8752e06784be1",
      "parents": [
        "2b4883641e324c50a2ee24c5bd15170c7d31e57d",
        "935752053ef2691dbb6d5a6d149e0e362c6e3c74"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Jan 19 09:40:34 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Jan 19 09:40:34 2011 -0800"
      },
      "message": "Merge \"Tentative fix for issue 3362362.\" into honeycomb"
    },
    {
      "commit": "018761c5cc4aefd0495eaa4666f2372a59a7980a",
      "tree": "e0e4a58c37774fe7034bc4f73122156989c713cd",
      "parents": [
        "2b4883641e324c50a2ee24c5bd15170c7d31e57d"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 19 09:20:58 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 19 09:20:58 2011 -0800"
      },
      "message": "Turn another assertion into a runtime error. Damn you surfaces.\n\nChange-Id: Ib62957180949293a6fb84bb5a40af058798337ab\nrelated-to-bug: 3335220\n"
    },
    {
      "commit": "935752053ef2691dbb6d5a6d149e0e362c6e3c74",
      "tree": "d0c6d5a1666aa6935a032a07d7c947bc8381a747",
      "parents": [
        "de16890e98cdd241398ed155cd47daf061584a77"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Jan 18 18:39:02 2011 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Jan 19 09:04:27 2011 -0800"
      },
      "message": "Tentative fix for issue 3362362.\n\nThe problem is likely that one method is called on the AudioPolicyManagerBase\ninstance while it is still being constructed by AudioPolicyService.\n\nTo avoid this, the AudioPolicyService mutex is held by the constructor until the\nplatform specific AudioPolicyManager is constructed and the member\nmpPolicyManager initialized.\n\nAlso added an initCheck() method to AudioPolicyInterface to verify successful\ninitialization of AudioPolicyManager.\n\nA similar change is done in AudioFlinger constructor.\nAlso added some missing protections in AudioFlinger methods where the\nplayback thread list is parsed.\n\nChange-Id: I006b244ec057e1bb0aa5ebe426ef006e3b171056\n"
    },
    {
      "commit": "b45c01c2b8588ff431b511151666a55a39f0a6ae",
      "tree": "94a766af98d29e9b6d745e42a5f625106267a2e1",
      "parents": [
        "2b4883641e324c50a2ee24c5bd15170c7d31e57d"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Sun Jan 16 11:30:13 2011 -0800"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 19 08:33:07 2011 -0800"
      },
      "message": "Fix the presentation video resolution when it is different from the actual image resolution of the video.\n\nbug - 3352413\n\nChange-Id: I8f08f3896e9fb90f09119dccdb88b82af60f79f2\n"
    },
    {
      "commit": "f6e3b6d3f097fca569dad806de426a4c6af5200c",
      "tree": "e8d0cfc8babb9dbaaaf5db76caad6d989c58c7ea",
      "parents": [
        "a2aba71b29fd7a201b3123736823fa2556dee2c6",
        "2b4883641e324c50a2ee24c5bd15170c7d31e57d"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Tue Jan 18 22:09:21 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 18 22:09:21 2011 -0800"
      },
      "message": "am 5fb60c7a: Use metadata in video buffers for timelapse video recording by default to eliminate memcpy\n\n* commit \u00275fb60c7af2cbf59a99ae324c4284c7860b37c723\u0027:\n  Use metadata in video buffers for timelapse video recording by default to eliminate memcpy\n"
    },
    {
      "commit": "2b4883641e324c50a2ee24c5bd15170c7d31e57d",
      "tree": "affc60536acc73b632055dbb1a76c55ac6b17557",
      "parents": [
        "de16890e98cdd241398ed155cd47daf061584a77"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Tue Jan 18 21:12:31 2011 -0800"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Tue Jan 18 21:33:58 2011 -0800"
      },
      "message": "Use metadata in video buffers for timelapse video recording by default to eliminate memcpy\n\nbug - 3361771\n\nChange-Id: Ib37ffe4be8edc8708baa76b3507b6f11372536d9\n"
    },
    {
      "commit": "a2aba71b29fd7a201b3123736823fa2556dee2c6",
      "tree": "9953a2d240e66589a4fc2ccd5d70c119f84b20f5",
      "parents": [
        "915cde53d1d1c9a1549f180d377db0b64a53233e",
        "de16890e98cdd241398ed155cd47daf061584a77"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 18 15:37:58 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 18 15:37:58 2011 -0800"
      },
      "message": "am 39560507: Merge \"Apparently our native TCP sockets do not return an error from blocking \"connect\"\" into honeycomb\n\n* commit \u002739560507215774873ba64b5f0ff61648488924ea\u0027:\n  Apparently our native TCP sockets do not return an error from blocking \"connect\"\n"
    },
    {
      "commit": "de16890e98cdd241398ed155cd47daf061584a77",
      "tree": "8273f7629019c9a38090c485b550d20b1b8969e2",
      "parents": [
        "31389148f4ab7587e150f4043b7379eaefe2af2b",
        "368ef16787c3fe2334dadc767e7418b610c83cbd"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 18 15:35:35 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Jan 18 15:35:35 2011 -0800"
      },
      "message": "Merge \"Apparently our native TCP sockets do not return an error from blocking \"connect\"\" into honeycomb"
    },
    {
      "commit": "368ef16787c3fe2334dadc767e7418b610c83cbd",
      "tree": "2eae79e5a3366c0f9cbaca2ff2771f4f3ed47f23",
      "parents": [
        "bf6489f8b4c03dda70bf7a549702b98da497e348"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 18 15:26:40 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 18 15:26:40 2011 -0800"
      },
      "message": "Apparently our native TCP sockets do not return an error from blocking \"connect\"\n\nif the network interface is shutdown while connecting.\n\nChange-Id: I1bd7e43475edf20f35e15dd4eae547126289f5f0\nrelated-to-bug: 3362836\n"
    },
    {
      "commit": "915cde53d1d1c9a1549f180d377db0b64a53233e",
      "tree": "3135117b2b3a40dbc574c8630fa4b8bd6155e8c7",
      "parents": [
        "0db958fd28db5919a6cc14c2088161160abe3788",
        "31389148f4ab7587e150f4043b7379eaefe2af2b"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Tue Jan 18 14:44:58 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 18 14:44:58 2011 -0800"
      },
      "message": "am 1418de7e: Merge \"Fix the sluggish preview during timelapse video recording because software encoder is used.\" into honeycomb\n\n* commit \u00271418de7eff012c37cf34328eb368a547d70a1441\u0027:\n  Fix the sluggish preview during timelapse video recording because software encoder is used.\n"
    },
    {
      "commit": "31389148f4ab7587e150f4043b7379eaefe2af2b",
      "tree": "28d20f9c37755cbf14af6cc2d20e7a17fc213efc",
      "parents": [
        "bf6489f8b4c03dda70bf7a549702b98da497e348"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Tue Jan 18 14:26:55 2011 -0800"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Tue Jan 18 14:28:37 2011 -0800"
      },
      "message": "Fix the sluggish preview during timelapse video recording because software encoder is used.\n\nbug - 3361771\n\nChange-Id: Ic5344e9eabe7f1b82910b65b4260e4ad8dc51c32\n"
    },
    {
      "commit": "0db958fd28db5919a6cc14c2088161160abe3788",
      "tree": "eb3ad13d1a1870803df9607f7910f4f64ab6593b",
      "parents": [
        "e8036de113ba88646724ab6fd5d7bb5d248b46f2",
        "bf6489f8b4c03dda70bf7a549702b98da497e348"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 18 11:54:08 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 18 11:54:08 2011 -0800"
      },
      "message": "am 529fc53d: Merge \"Implement parsing of vbv buffering info in RTSP.\" into honeycomb\n\n* commit \u0027529fc53d3fd298ee5aef20e3a07bd263f7376b8d\u0027:\n  Implement parsing of vbv buffering info in RTSP.\n"
    },
    {
      "commit": "bf6489f8b4c03dda70bf7a549702b98da497e348",
      "tree": "605ed35b22591607ec15680a63d6cce4002cfa6d",
      "parents": [
        "126983a5afae1a554a8bb26711bb01edb1ddf5b1",
        "21a6f9ffee8b3c014abfe165b8f7fd2224f49e1f"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 18 11:52:02 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Jan 18 11:52:02 2011 -0800"
      },
      "message": "Merge \"Implement parsing of vbv buffering info in RTSP.\" into honeycomb"
    },
    {
      "commit": "e8036de113ba88646724ab6fd5d7bb5d248b46f2",
      "tree": "2d377c8491f992207a830aa5f8ed76d8048946fb",
      "parents": [
        "f203a0f833a3f215f9971444e7192bd905a11ebf",
        "126983a5afae1a554a8bb26711bb01edb1ddf5b1"
      ],
      "author": {
        "name": "Bryan Mawhinney",
        "email": "bryanmawhinney@google.com",
        "time": "Tue Jan 18 11:31:51 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 18 11:31:51 2011 -0800"
      },
      "message": "am 3a4d547c: Merge \"Don\\\u0027t report 100% buffered when the stream ends prematurely.\" into honeycomb\n\n* commit \u00273a4d547c588dc3a1abb48988595dc17874660bb8\u0027:\n  Don\u0027t report 100% buffered when the stream ends prematurely.\n"
    },
    {
      "commit": "126983a5afae1a554a8bb26711bb01edb1ddf5b1",
      "tree": "186a713ca97792b9e0763362c93ca52f30d95ac9",
      "parents": [
        "aa95240d9096f97aa2e2022fae8764a4386c8951",
        "1bd233ce7e1aa7730bc18d46ffd57791391738cd"
      ],
      "author": {
        "name": "Bryan Mawhinney",
        "email": "bryanmawhinney@google.com",
        "time": "Tue Jan 18 11:30:30 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Jan 18 11:30:30 2011 -0800"
      },
      "message": "Merge \"Don\u0027t report 100% buffered when the stream ends prematurely.\" into honeycomb"
    },
    {
      "commit": "f203a0f833a3f215f9971444e7192bd905a11ebf",
      "tree": "2603f1c8e951cc88d355afdfb65c96b15e42cbe3",
      "parents": [
        "67cde67ff08b94ece035ac35a7a1b33b01677b1f",
        "aa95240d9096f97aa2e2022fae8764a4386c8951"
      ],
      "author": {
        "name": "Mike Lockwood",
        "email": "lockwood@android.com",
        "time": "Tue Jan 18 11:20:22 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 18 11:20:22 2011 -0800"
      },
      "message": "am 0de274b3: Merge \"MTP: Fix problems with modification dates for folders and non-media files\" into honeycomb\n\n* commit \u00270de274b34c554a0e87b1071e001e41e416cd7678\u0027:\n  MTP: Fix problems with modification dates for folders and non-media files\n"
    },
    {
      "commit": "21a6f9ffee8b3c014abfe165b8f7fd2224f49e1f",
      "tree": "140750d63bf8e4e50e67bdcdd737e0af18ee79e0",
      "parents": [
        "ccb3506ed1845121b94f4e27244e61a46eb19815"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 18 11:19:13 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 18 11:19:13 2011 -0800"
      },
      "message": "Implement parsing of vbv buffering info in RTSP.\n\nChange-Id: I7d871cafda2c4c65670a40ad9ab4f24317f8568a\nrelated-to-bug: 3351915\n"
    },
    {
      "commit": "1bd233ce7e1aa7730bc18d46ffd57791391738cd",
      "tree": "f260f0d8821d1f36fbfcf9f678fb80f62ec099b9",
      "parents": [
        "ccb3506ed1845121b94f4e27244e61a46eb19815"
      ],
      "author": {
        "name": "Bryan Mawhinney",
        "email": "bryanmawhinney@google.com",
        "time": "Tue Jan 18 19:12:21 2011 +0000"
      },
      "committer": {
        "name": "Bryan Mawhinney",
        "email": "bryanmawhinney@google.com",
        "time": "Tue Jan 18 19:12:21 2011 +0000"
      },
      "message": "Don\u0027t report 100% buffered when the stream ends prematurely.\n\nChange-Id: Ia4e80d02f28104427a3309e3d5b155faa5702757\n"
    },
    {
      "commit": "aa95240d9096f97aa2e2022fae8764a4386c8951",
      "tree": "ee23a4189c0152e2d5528887d5861566ef5ada6f",
      "parents": [
        "ccb3506ed1845121b94f4e27244e61a46eb19815"
      ],
      "author": {
        "name": "Mike Lockwood",
        "email": "lockwood@android.com",
        "time": "Tue Jan 18 11:06:19 2011 -0800"
      },
      "committer": {
        "name": "Mike Lockwood",
        "email": "lockwood@android.com",
        "time": "Tue Jan 18 11:07:11 2011 -0800"
      },
      "message": "MTP: Fix problems with modification dates for folders and non-media files\n\nAlso removed an unnecessary parameter to MtpDatabase.endSendobject()\n\nBUG: 3352142\n\nChange-Id: I6fd812dcba4814956bc8bc1cbd6bd5c868197790\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n"
    },
    {
      "commit": "67cde67ff08b94ece035ac35a7a1b33b01677b1f",
      "tree": "09e37275bf66cc6ec260deab0910bb990b09802e",
      "parents": [
        "f9c1f51b261d45632625b501f44f2b2214ce3352",
        "ccb3506ed1845121b94f4e27244e61a46eb19815"
      ],
      "author": {
        "name": "Dharmaray Kundargi",
        "email": "dharmaray@google.com",
        "time": "Mon Jan 17 11:40:16 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Jan 17 11:40:16 2011 -0800"
      },
      "message": "am 307003a8: Merge \"integrate videoeditor preview player.\" into honeycomb\n\n* commit \u0027307003a844c90458bcfd7398c44bbae734936238\u0027:\n  integrate videoeditor preview player.\n"
    },
    {
      "commit": "ccb3506ed1845121b94f4e27244e61a46eb19815",
      "tree": "28dbe58d3112cb15c9b87d94897d2aa73b1042e3",
      "parents": [
        "6ee94582e3ce7bdd9625345e7564e3176a51a2f3"
      ],
      "author": {
        "name": "Dharmaray Kundargi",
        "email": "dharmaray@google.com",
        "time": "Sun Jan 16 16:43:20 2011 -0800"
      },
      "committer": {
        "name": "Dharmaray Kundargi",
        "email": "dharmaray@google.com",
        "time": "Sun Jan 16 16:43:20 2011 -0800"
      },
      "message": "integrate videoeditor preview player.\n\nChange-Id: I83084f494605c8e6f4d198afa8c36f9e29579667\n"
    },
    {
      "commit": "f9c1f51b261d45632625b501f44f2b2214ce3352",
      "tree": "379120f00cb9d85b1d61238cba2b3fd0e47464a1",
      "parents": [
        "cc43adab338983c5b5bc8ca0658bbc2d56603f09",
        "cf3592c5bf1c66ba510934fff5eb57ee0b3fd761"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Jan 14 21:30:16 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Jan 14 21:30:16 2011 -0800"
      },
      "message": "am 9286cfe5: (-s ours) merge 83fdc69e from gingerbread - do not merge\n\n* commit \u00279286cfe5017363d95798d85163ec4f28aeb0c675\u0027:\n  Squash commits of the following patches, cherry-picked from other branch - do not merge.\n"
    },
    {
      "commit": "cc43adab338983c5b5bc8ca0658bbc2d56603f09",
      "tree": "379120f00cb9d85b1d61238cba2b3fd0e47464a1",
      "parents": [
        "6508ec903e7b6596a3b8167e3b18d0b966ea1b8f",
        "6ee94582e3ce7bdd9625345e7564e3176a51a2f3"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Fri Jan 14 19:22:26 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Jan 14 19:22:26 2011 -0800"
      },
      "message": "am e7df0dde: Merge \"Fixed thrashing in the cached buffer during 720p YT video streaming\" into honeycomb\n\n* commit \u0027e7df0ddee486f4705b17b4d8ed57ddbeb8b71943\u0027:\n  Fixed thrashing in the cached buffer during 720p YT video streaming\n"
    },
    {
      "commit": "cf3592c5bf1c66ba510934fff5eb57ee0b3fd761",
      "tree": "db789ee0027babcee8f5a9a4b090546275365b8f",
      "parents": [
        "3ed11317ce695a413d337c60fde222f30306f092",
        "95304d5488ba465f19cc788f1c7394218c2ea2d1"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Jan 14 18:33:51 2011 -0800"
      },
      "committer": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Jan 14 18:33:51 2011 -0800"
      },
      "message": "merge 83fdc69e from gingerbread - do not merge\n\nChange-Id: Ib1e9e12244a44f75a93d66142e71915de6386680\n"
    },
    {
      "commit": "6ee94582e3ce7bdd9625345e7564e3176a51a2f3",
      "tree": "bf2c802a855fcddb53ff057e0889e11a363ee846",
      "parents": [
        "42dd1d5f186252a7f09f8fb1a46ea82e3877b2d3"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Fri Jan 14 15:15:12 2011 -0800"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Fri Jan 14 15:15:12 2011 -0800"
      },
      "message": "Fixed thrashing in the cached buffer during 720p YT video streaming\n\nbug - 3340194\n\nChange-Id: Ic59bb18ab1731d7dd7cae7cc8aeb393900bce7f6\n"
    },
    {
      "commit": "6508ec903e7b6596a3b8167e3b18d0b966ea1b8f",
      "tree": "bd1100e370bfc582f36ff046b47a9371ad8cbab7",
      "parents": [
        "641f3f4778ed52c4225ced1eb3ee59cb3ee72a67",
        "3ed11317ce695a413d337c60fde222f30306f092"
      ],
      "author": {
        "name": "Gloria Wang",
        "email": "gwang@google.com",
        "time": "Thu Jan 13 12:38:29 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Jan 13 12:38:29 2011 -0800"
      },
      "message": "am 1dac4cdd: am a220a297: Merge \"Initial OMA DRM forward lock contribution\"\n\n* commit \u00271dac4cdd6faba15426a0b37a7a615c04f5a35394\u0027:\n  Initial OMA DRM forward lock contribution\n"
    },
    {
      "commit": "3ed11317ce695a413d337c60fde222f30306f092",
      "tree": "f6690821acfed0e3c10e34c0e8b1354a987122df",
      "parents": [
        "72b228f6b18763a95023fd8ba44eb7354cfd7f74",
        "13e05b3f569965d97ec7d7f65e4cd46c6a22c23d"
      ],
      "author": {
        "name": "Gloria Wang",
        "email": "gwang@google.com",
        "time": "Thu Jan 13 11:11:51 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Jan 13 11:11:51 2011 -0800"
      },
      "message": "am a220a297: Merge \"Initial OMA DRM forward lock contribution\"\n\n* commit \u0027a220a2979937700024662be0f8fc166ca65506ed\u0027:\n  Initial OMA DRM forward lock contribution\n"
    },
    {
      "commit": "13e05b3f569965d97ec7d7f65e4cd46c6a22c23d",
      "tree": "27dbcb7a1f26d44723dbb123ce4c36e6cfc1b177",
      "parents": [
        "c2322f7ac756e78de9491c17dc3c0dd14456c599",
        "fdd65a0fc7df2c878cc601e4c0f4021cb264f051"
      ],
      "author": {
        "name": "Gloria Wang",
        "email": "gwang@google.com",
        "time": "Thu Jan 13 10:51:13 2011 -0800"
      },
      "committer": {
        "name": "Android Code Review",
        "email": "code-review@android.com",
        "time": "Thu Jan 13 10:51:13 2011 -0800"
      },
      "message": "Merge \"Initial OMA DRM forward lock contribution\""
    },
    {
      "commit": "641f3f4778ed52c4225ced1eb3ee59cb3ee72a67",
      "tree": "eead2fe2eb55f6681532712bea9f5232422cdfa9",
      "parents": [
        "d19fd00c6faaf28af60115b587ff00e1c32bda66",
        "42dd1d5f186252a7f09f8fb1a46ea82e3877b2d3"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Thu Jan 13 10:24:44 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Jan 13 10:24:44 2011 -0800"
      },
      "message": "am c14b10c3: Merge \"Add audio encoding parameters check\" into honeycomb\n\n* commit \u0027c14b10c3068359b717b3f35b7218ce0e6dcdd08c\u0027:\n  Add audio encoding parameters check\n"
    },
    {
      "commit": "42dd1d5f186252a7f09f8fb1a46ea82e3877b2d3",
      "tree": "8169be6605d7f2cd2bc5d3e5a21b1c0ef146e176",
      "parents": [
        "3e9eeb3b411f56d9935f9240056107816da24653"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 12 20:45:16 2011 -0800"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 12 20:45:16 2011 -0800"
      },
      "message": "Add audio encoding parameters check\n\nbug - 3345296\n\nChange-Id: If3f33955f5473b0c5ad9c9b85f8b5cb21ddd7e65\n"
    },
    {
      "commit": "d19fd00c6faaf28af60115b587ff00e1c32bda66",
      "tree": "8227d7736ee78d8901b41b462ae398ec607a1679",
      "parents": [
        "0d75b03796a2b30cc5cf4baf5804e45219c62eac",
        "72b228f6b18763a95023fd8ba44eb7354cfd7f74"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 12 19:01:37 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 12 19:01:37 2011 -0800"
      },
      "message": "am c88b2c44: am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.\n\n* commit \u0027c88b2c44117e7e3ff3deb786f7d984f4096a63de\u0027:\n  Fail to parse duration instead of asserting, if the server response cannot be parsed.\n"
    },
    {
      "commit": "0d75b03796a2b30cc5cf4baf5804e45219c62eac",
      "tree": "8227d7736ee78d8901b41b462ae398ec607a1679",
      "parents": [
        "ae7f6cd0b9d0033ed0a2ded8da56a60ee636552d",
        "4c0104e004f30d7e48381ef8d728b2e93931611f"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 12 19:01:17 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 12 19:01:17 2011 -0800"
      },
      "message": "am 0ef0d76a: (-s ours) am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues\n\n* commit \u00270ef0d76a9d5477942d5586933d35d299671fadc5\u0027:\n  DO NOT MERGE: Fix Matroska issues\n"
    },
    {
      "commit": "ae7f6cd0b9d0033ed0a2ded8da56a60ee636552d",
      "tree": "8227d7736ee78d8901b41b462ae398ec607a1679",
      "parents": [
        "cf97dff7e5d6ed4d80be0f468a43c2360836d439",
        "960737e761895d5850beabab809d03b3621d0ec3"
      ],
      "author": {
        "name": "repo sync",
        "email": "andih@google.com",
        "time": "Wed Jan 12 17:58:48 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 12 17:58:48 2011 -0800"
      },
      "message": "am d439ac39: resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp\n\n* commit \u0027d439ac396ecb9e909c543424211d563325fea72b\u0027:\n  DO NOT MERGE: Fix parsing of ntp\u003d PLAY response.\n"
    },
    {
      "commit": "95304d5488ba465f19cc788f1c7394218c2ea2d1",
      "tree": "5f5269238a292e0e747cbfa2a01e6a2fb24615b8",
      "parents": [
        "e49051406baa71cb63d5754d33908ce3df201af1"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Thu Dec 02 17:42:08 2010 -0800"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 12 17:12:46 2011 -0800"
      },
      "message": "Squash commits of the following patches, cherry-picked from other branch - do not merge.\n\no Prepare for publishing MediaMetadataRetriever as public API\n  step one:\n  o replaced captureFrame with getFrameAtTime\n  o removed getMode\n\no Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime()\n  as part of the preparation for publishing MediaMetadataRetriever as public Java API\n\no Remove captureFrame from MediaMetadataRetriever.java class\n  It has been replaced by getFrameAtTime() method\n\no Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java\n\no Publish MediaMetadataRetriever.java as public API\n  o Removed setMode() methods and related mode constants\n  o Removed some of the unused the metadata keys\n  o Updated the javadoc\n  o part of a multi-project change.\n\nbug - 3309041\n\nChange-Id: I2efb6e8b8d52897186b016cb4efda6862f5584c4\n"
    },
    {
      "commit": "cf97dff7e5d6ed4d80be0f468a43c2360836d439",
      "tree": "8227d7736ee78d8901b41b462ae398ec607a1679",
      "parents": [
        "20df25aae1a065d3671d8d6d9d5d81836054de7b",
        "7b8a803497450bb90b9c4f5ba3426bf984fad274"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 12 15:31:01 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 12 15:31:01 2011 -0800"
      },
      "message": "am 0569e589: (-s ours) am 13d1cb56: Merge \"Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge\" into gingerbread\n\n* commit \u00270569e58988bae5f08733e21e8d8adfa61fe89b7f\u0027:\n  Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge\n"
    },
    {
      "commit": "20df25aae1a065d3671d8d6d9d5d81836054de7b",
      "tree": "8227d7736ee78d8901b41b462ae398ec607a1679",
      "parents": [
        "3cb13098df7b0c2aaae7b18f1518b02447f3b8c0",
        "3e9eeb3b411f56d9935f9240056107816da24653"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 12 14:35:46 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 12 14:35:46 2011 -0800"
      },
      "message": "am 7928ca6f: Merge \"Fail to parse duration instead of asserting, if the server response cannot be parsed.\" into honeycomb\n\n* commit \u00277928ca6f87af4b70086ecf75383ba43da37da891\u0027:\n  Fail to parse duration instead of asserting, if the server response cannot be parsed.\n"
    },
    {
      "commit": "3cb13098df7b0c2aaae7b18f1518b02447f3b8c0",
      "tree": "1bae54c308898f7ebb3b577706f5ba3654c2cf86",
      "parents": [
        "367bb55aaf022b7f727478cbd3b50866a9e537f4",
        "7f7d52ac18dfc3c6d8f6267dad29306613e9bd0e"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 12 14:35:35 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 12 14:35:35 2011 -0800"
      },
      "message": "am 068b41d5: Merge \"Publish MediaMetadataRetriever.java as public API\" into honeycomb\n\n* commit \u0027068b41d5d41a4a78c96586b85ea89d464d302548\u0027:\n  Publish MediaMetadataRetriever.java as public API\n"
    },
    {
      "commit": "3e9eeb3b411f56d9935f9240056107816da24653",
      "tree": "cfaad6e7a887102b85359705a8f0d3267bb6fb71",
      "parents": [
        "7f7d52ac18dfc3c6d8f6267dad29306613e9bd0e",
        "934ca8cb1bcffcf1781a576ca625d2f901e5f0a9"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 12 14:33:51 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Jan 12 14:33:51 2011 -0800"
      },
      "message": "Merge \"Fail to parse duration instead of asserting, if the server response cannot be parsed.\" into honeycomb"
    },
    {
      "commit": "7f7d52ac18dfc3c6d8f6267dad29306613e9bd0e",
      "tree": "5e17f415d44cdba3c8b37a42c487e28e26593a64",
      "parents": [
        "67988a9ba5a081d14dbd8a663516e1d484d829df"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Thu Jan 06 12:20:35 2011 -0800"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 12 14:14:11 2011 -0800"
      },
      "message": "Publish MediaMetadataRetriever.java as public API\n\no Removed setMode() methods and related mode constants\no Removed some of the unused the metadata keys\no Updated the javadoc\n\no part of a multi-project change.\n\nbug - 2433195\n\nChange-Id: I5ed167f1fd6a53cb143b7dc385b149431d434438\n"
    },
    {
      "commit": "367bb55aaf022b7f727478cbd3b50866a9e537f4",
      "tree": "d16d2d850518676f9fad78a6c3865dffbf375256",
      "parents": [
        "0ea67d828529b3c3a0c6a6cfeb653ecdc7252a90",
        "67988a9ba5a081d14dbd8a663516e1d484d829df"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 12 11:56:01 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 12 11:56:01 2011 -0800"
      },
      "message": "am cb0f6d0b: Merge \"Speed up MP3Extractor using cached reads\" into honeycomb\n\n* commit \u0027cb0f6d0b42b264ec6aa2a98fe210d72ed10f73ed\u0027:\n  Speed up MP3Extractor using cached reads\n"
    },
    {
      "commit": "67988a9ba5a081d14dbd8a663516e1d484d829df",
      "tree": "87174f60c8ae8886df65970ab81aa92445ef3f34",
      "parents": [
        "4dafe5b814c923538a0f275b62220ec9cc94a9b5",
        "7cc497733b7602b99b783decfa8c002bc27e25aa"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 12 11:54:32 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Jan 12 11:54:32 2011 -0800"
      },
      "message": "Merge \"Speed up MP3Extractor using cached reads\" into honeycomb"
    },
    {
      "commit": "72b228f6b18763a95023fd8ba44eb7354cfd7f74",
      "tree": "d17c7c9cf584a6fdcc3d7318e52cc0baa8937e23",
      "parents": [
        "4c0104e004f30d7e48381ef8d728b2e93931611f",
        "e49051406baa71cb63d5754d33908ce3df201af1"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 12 10:35:18 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 12 10:35:18 2011 -0800"
      },
      "message": "am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.\n\n* commit \u00277c6153606cc963191362494c8cb5669749e84326\u0027:\n  Fail to parse duration instead of asserting, if the server response cannot be parsed.\n"
    },
    {
      "commit": "934ca8cb1bcffcf1781a576ca625d2f901e5f0a9",
      "tree": "946f9b81777549201bfff4446fcfcdb005cf3d44",
      "parents": [
        "c4c3a2d4123f7dfe8c6ed0c26fb14aeb7b8d8f61"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 12 09:57:23 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 12 10:31:04 2011 -0800"
      },
      "message": "Fail to parse duration instead of asserting, if the server response cannot be parsed.\n\nChange-Id: I42324468edca5ccce29486059091da8e64f36326\nrelated-to-bug: 3338518\n"
    },
    {
      "commit": "e49051406baa71cb63d5754d33908ce3df201af1",
      "tree": "18fde73551a4c51a3c6d9c9edecfecc816507c0e",
      "parents": [
        "9a0cf4fb7d18e186e06341bde915de234992d969"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 12 09:57:23 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Wed Jan 12 09:57:23 2011 -0800"
      },
      "message": "Fail to parse duration instead of asserting, if the server response cannot be parsed.\n\nChange-Id: I95c61ed83800db82e99c0023b942fb8ae05ed3cf\nrelated-to-bug: 3338518\n"
    },
    {
      "commit": "7cc497733b7602b99b783decfa8c002bc27e25aa",
      "tree": "3004d896aebf64aaeb2c48348021366e020e9cba",
      "parents": [
        "c4c3a2d4123f7dfe8c6ed0c26fb14aeb7b8d8f61"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Tue Jan 11 18:59:32 2011 -0800"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Jan 12 09:49:15 2011 -0800"
      },
      "message": "Speed up MP3Extractor using cached reads\n\nChange-Id: I53a5ed76bc2f76f0c184f3800b5448f677117ae3\n"
    },
    {
      "commit": "0ea67d828529b3c3a0c6a6cfeb653ecdc7252a90",
      "tree": "3905f253ef3b75de155bfda1da1264098db54cc5",
      "parents": [
        "bdcc8dc002f9b936fe6cd0a8ae4f8a6cdf523c40",
        "4dafe5b814c923538a0f275b62220ec9cc94a9b5"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Jan 12 09:36:00 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 12 09:36:00 2011 -0800"
      },
      "message": "am e5cf7f2b: Merge \"Fix race in buffer ref counting.\" into honeycomb\n\n* commit \u0027e5cf7f2bc51913d87bf97c8a1885f736edc5f0bc\u0027:\n  Fix race in buffer ref counting.\n"
    },
    {
      "commit": "4dafe5b814c923538a0f275b62220ec9cc94a9b5",
      "tree": "4a6fa7ec2a746f4fd94b85833beeaa5e4e9c0c05",
      "parents": [
        "c4c3a2d4123f7dfe8c6ed0c26fb14aeb7b8d8f61"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Jan 12 09:22:07 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Jan 12 09:22:07 2011 -0800"
      },
      "message": "Fix race in buffer ref counting.\n\nChange-Id: Id47c30469c3e3ec293ed2ef574a191275b5044d6\n"
    },
    {
      "commit": "4c0104e004f30d7e48381ef8d728b2e93931611f",
      "tree": "99d6c0e2d582ecb8a85a7bd33142535f1cf02595",
      "parents": [
        "960737e761895d5850beabab809d03b3621d0ec3",
        "9a0cf4fb7d18e186e06341bde915de234992d969"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 11 16:22:33 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 11 16:22:33 2011 -0800"
      },
      "message": "am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues\n\n* commit \u00277e2f9cc81da788006790365ff11f06551fc1bc26\u0027:\n  DO NOT MERGE: Fix Matroska issues\n"
    },
    {
      "commit": "9a0cf4fb7d18e186e06341bde915de234992d969",
      "tree": "b476b0c1e1e5d7abc7ae61e653cebda64d81681d",
      "parents": [
        "0d85990f20106513b6da5a446702aa62ab61397f"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 11 16:01:33 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 11 16:02:31 2011 -0800"
      },
      "message": "DO NOT MERGE: Fix Matroska issues\n\nrelated-to-bug: 3331623\n\nSquashed commit of the following:\n\ncommit 8484811f3784564ce962ec1b6311bac532d73ffc\nAuthor: Andreas Huber \u003candih@google.com\u003e\nDate:   Tue Jan 11 11:56:06 2011 -0800\n\n    Properly parse Matroska lacing flags and extract all frames contained in a block.\n\n    related-to-bug: 3331623\n\ncommit 38f1f39381a01659577461b3d35bd22db45ba317\nAuthor: Andreas Huber \u003candih@google.com\u003e\nDate:   Mon Nov 15 15:10:34 2010 -0800\n\n    Proper support for variable NALsize lengths of AVC content in .mkv files.\n\n    related-to-bug: 3197442\n\nChange-Id: I4b404f3c3d0a2a2fa336b9edff75eb25ffc66a2f\n"
    },
    {
      "commit": "960737e761895d5850beabab809d03b3621d0ec3",
      "tree": "f3296d85930b340675dc2c41bcb80ac29af16e03",
      "parents": [
        "7b8a803497450bb90b9c4f5ba3426bf984fad274",
        "0d85990f20106513b6da5a446702aa62ab61397f"
      ],
      "author": {
        "name": "repo sync",
        "email": "andih@google.com",
        "time": "Tue Jan 11 15:26:51 2011 -0800"
      },
      "committer": {
        "name": "repo sync",
        "email": "andih@google.com",
        "time": "Tue Jan 11 15:26:51 2011 -0800"
      },
      "message": "resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp\n\nChange-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26\n"
    },
    {
      "commit": "bdcc8dc002f9b936fe6cd0a8ae4f8a6cdf523c40",
      "tree": "7524a7777c6a5c1b80d19f9a3405e1098272b334",
      "parents": [
        "575bb4d0fe5da758c695a046bb318caa0cae3e1f",
        "c4c3a2d4123f7dfe8c6ed0c26fb14aeb7b8d8f61"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 11 15:22:46 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 11 15:22:46 2011 -0800"
      },
      "message": "am 0827e697: Merge \"Increase cache size and low-watermark threshold, also\" into honeycomb\n\n* commit \u00270827e697a9965195ca12ba593332c555702aa94a\u0027:\n  Increase cache size and low-watermark threshold, also\n"
    },
    {
      "commit": "575bb4d0fe5da758c695a046bb318caa0cae3e1f",
      "tree": "09f591f99fd5fcd8191799dbd2f9b90cf84c57a0",
      "parents": [
        "ac2652c25f5d2a38709131f7731651bc5819fed5",
        "fd52174eaacf661e9e7b1ff0001a9587f1b90b87"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 11 15:22:42 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 11 15:22:42 2011 -0800"
      },
      "message": "am 7f92be88: Merge \"Properly parse Matroska lacing flags and extract all frames contained in a block.\" into honeycomb\n\n* commit \u00277f92be88e0d89a693bed4d620a83aea1a989c68e\u0027:\n  Properly parse Matroska lacing flags and extract all frames contained in a block.\n"
    },
    {
      "commit": "c4c3a2d4123f7dfe8c6ed0c26fb14aeb7b8d8f61",
      "tree": "6d4de35e173f9e2497dbc1b8b449ebc0e1b9e54d",
      "parents": [
        "fd52174eaacf661e9e7b1ff0001a9587f1b90b87",
        "145e68fc778275963189b02a1adcbe27cce4d769"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 11 15:20:39 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Jan 11 15:20:39 2011 -0800"
      },
      "message": "Merge \"Increase cache size and low-watermark threshold, also\" into honeycomb"
    },
    {
      "commit": "fd52174eaacf661e9e7b1ff0001a9587f1b90b87",
      "tree": "2b9d911b20fd123fd563971fe4a44d63f270fb07",
      "parents": [
        "8eb04084b96d59802615f0e0570359c35ca3df61",
        "50c8bea8fba2fcafb14696399028bdbc094dc995"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 11 15:16:04 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Jan 11 15:16:04 2011 -0800"
      },
      "message": "Merge \"Properly parse Matroska lacing flags and extract all frames contained in a block.\" into honeycomb"
    },
    {
      "commit": "145e68fc778275963189b02a1adcbe27cce4d769",
      "tree": "91addc4557024a25d8ba64efc79b821be5ca1877",
      "parents": [
        "0ecfbd1cf37dbfb44d19c27351f5769309ac028d"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 11 15:05:28 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 11 15:05:28 2011 -0800"
      },
      "message": "Increase cache size and low-watermark threshold, also\n\nMediaPlayer now sends out MEDIA_INFO,MEDIA_INFO_VIDEO_TRACK_LAGGING messages\nto the JAVA client informing it how much (if at all) the video lags behind\naudio (arg2 is the media delay in ms).\n\nChange-Id: I6933f573d8597a35112e4b5ee0fcb826a7f6ddd1\nrelated-to-bug: 3335220\n"
    },
    {
      "commit": "ac2652c25f5d2a38709131f7731651bc5819fed5",
      "tree": "d8c86badbc1e53832fe2e3cf41f7970843c3f471",
      "parents": [
        "b03f5627d4e0d80ea7b185e0af1d8a5d19461325",
        "9cfc9eff42a0700029c39e89c38b52488845ad63"
      ],
      "author": {
        "name": "Gloria Wang",
        "email": "gwang@google.com",
        "time": "Tue Jan 11 14:55:56 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 11 14:55:56 2011 -0800"
      },
      "message": "am 9e0bb6d5: am 0544d059: Merge \"DRM Framework bug fixes.\"\n\n* commit \u00279e0bb6d5eef5dfe2da60c50f3aaa39512307d11d\u0027:\n  DRM Framework bug fixes.\n"
    },
    {
      "commit": "b03f5627d4e0d80ea7b185e0af1d8a5d19461325",
      "tree": "1a9363b2e35928f3d126e20c54d8ba76a2cad37a",
      "parents": [
        "8eb04084b96d59802615f0e0570359c35ca3df61",
        "e28b1e565705ffb85b05c8e226e1ab5010cb3821"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Tue Jan 11 13:53:11 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 11 13:53:11 2011 -0800"
      },
      "message": "am d1da80a4: am ba77a3f9: Add support for the \"compilation\" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831\n\n* commit \u0027d1da80a4b3d50c1be120b0e873363da711428a81\u0027:\n  Add support for the \"compilation\" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831\n"
    },
    {
      "commit": "50c8bea8fba2fcafb14696399028bdbc094dc995",
      "tree": "2c80abf4d69357ba8f4ae3652b90f717f2a626fd",
      "parents": [
        "0ecfbd1cf37dbfb44d19c27351f5769309ac028d"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 11 11:56:06 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 11 13:05:36 2011 -0800"
      },
      "message": "Properly parse Matroska lacing flags and extract all frames contained in a block.\n\nChange-Id: I1aca46b2e28b9cad88bf4a296f675e81e66ee095\nrelated-to-bug: 3331623\n"
    },
    {
      "commit": "8eb04084b96d59802615f0e0570359c35ca3df61",
      "tree": "1a9363b2e35928f3d126e20c54d8ba76a2cad37a",
      "parents": [
        "b0fb6bf746f1d611033c55a4a1ab5a4b0e212a95",
        "c29dd6f4ccd7ea7e41921d48d03d26e159aeaae4"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Tue Jan 11 11:23:47 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Jan 11 11:23:47 2011 -0800"
      },
      "message": "Merge \"Fix uninitialized rect structure for retrieving rect cropping information from decoder\" into honeycomb"
    },
    {
      "commit": "0d85990f20106513b6da5a446702aa62ab61397f",
      "tree": "82de1cf909430710c421b3ce311087e7699cd3b8",
      "parents": [
        "32c8335c6b6eb87a88e9193db1a5aab29175d043"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 11 09:51:34 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Jan 11 09:53:30 2011 -0800"
      },
      "message": "DO NOT MERGE: Fix parsing of ntp\u003d PLAY response.\n\nrelated-to-bug: 3340186\n\nSquashed commit of the following:\n\ncommit b61c36b7228aec9f5360883b1e1c1e0530488974\nAuthor: Andreas Huber \u003candih@google.com\u003e\nDate:   Wed Oct 27 13:59:59 2010 -0700\n\n    Better support for MP4A-LATM RTP disassembly. This used to fail if mNumSubFrames \u003e 1 and the sub frames did not align with RTP packet boundaries.\n\ncommit b10f322c07e5bebcaf032e8624cb4a5d733dfc15\nAuthor: Andreas Huber \u003candih@google.com\u003e\nDate:   Mon Oct 25 09:40:52 2010 -0700\n\n    We don\u0027t have access to the md5 implementation on the simulator, let\u0027s disable digest authentication in rtsp for simulator targets.\n\ncommit 0aa83cf9e4637adf9501708fcdf7d0d6d4dc4fe1\nAuthor: Andreas Huber \u003candih@google.com\u003e\nDate:   Wed Oct 20 15:00:34 2010 -0700\n\n    Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF.\n\n    related-to-bug: 3084183\n\nChange-Id: I6e512cb73cc8d5624a83f7154aa5699f7fef7534\n"
    },
    {
      "commit": "b0fb6bf746f1d611033c55a4a1ab5a4b0e212a95",
      "tree": "8e66813414547645fdffd9eaae53f81f5fd2e400",
      "parents": [
        "0ecfbd1cf37dbfb44d19c27351f5769309ac028d"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Mon Jan 10 20:42:21 2011 -0800"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Mon Jan 10 20:43:33 2011 -0800"
      },
      "message": "Don\u0027t release the video recording frame after recording is stopped in CameraSourceTimeLapse.cpp\n\nbug - 3334999\n\nChange-Id: I1c83080713696221048da9b1a9f8c2ee48849ade\n"
    },
    {
      "commit": "7b8a803497450bb90b9c4f5ba3426bf984fad274",
      "tree": "74e28c69edf407830c632b5a1dd2e8fc7344b416",
      "parents": [
        "9cfc9eff42a0700029c39e89c38b52488845ad63",
        "32c8335c6b6eb87a88e9193db1a5aab29175d043"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Mon Jan 10 12:09:09 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Jan 10 12:09:09 2011 -0800"
      },
      "message": "am 13d1cb56: Merge \"Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge\" into gingerbread\n\n* commit \u002713d1cb56dfdfc89888de6a0389b0fe6cf7e36c27\u0027:\n  Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge\n"
    },
    {
      "commit": "0ecfbd1cf37dbfb44d19c27351f5769309ac028d",
      "tree": "11b98dba45992626a17714e04272cdb3fd0fe930",
      "parents": [
        "32ad210e4e4bcbdf912a01c9d2ff105cb3c5056f"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Mon Jan 10 11:57:30 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Mon Jan 10 11:57:30 2011 -0800"
      },
      "message": "Return a runtime error instead of asserting if the M4vH263Decoder fails in start()\n\nChange-Id: Ie704a72685f749613fa0ed5fa6f461abc0406371\nrelated-to-bug: 3328200\n"
    },
    {
      "commit": "32ad210e4e4bcbdf912a01c9d2ff105cb3c5056f",
      "tree": "57bc9bcd78d3844035a923a70b516e4dc2872a24",
      "parents": [
        "14c858e80dfe2030c9f343dc0c6e2048e030731b",
        "31e2508c75018145a8238925ff1a08cbde4e799a"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Mon Jan 10 11:26:38 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Jan 10 11:26:38 2011 -0800"
      },
      "message": "Merge \"NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications.\" into honeycomb"
    },
    {
      "commit": "31e2508c75018145a8238925ff1a08cbde4e799a",
      "tree": "072e86ff81cc378452262d8ff899301ae8abf696",
      "parents": [
        "eb0d0c48ebfcee5e8141ae25fe42a9eac6aae230"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Mon Jan 10 10:38:31 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Mon Jan 10 10:38:31 2011 -0800"
      },
      "message": "NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications.\n\nChange-Id: I99b4223ad6ecfd8839a3c0e737fef3165565d76d\nrelated-to-bug: 3336496\n"
    },
    {
      "commit": "32c8335c6b6eb87a88e9193db1a5aab29175d043",
      "tree": "a7ee67ba1dd4051a2440eeee2f1347dc133d8389",
      "parents": [
        "288fb7e5bd7060cbe9b737500975754c9312e2db"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Mon Jan 10 08:55:02 2011 -0800"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Mon Jan 10 10:27:02 2011 -0800"
      },
      "message": "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge\n\ncherry-picked from: I4c79b66a900c527e3ae6a833f76d5da1b75c5a89\n\nbug - 3336424\n\nChange-Id: I2d8ecb79a5422342988c195c012c9e6327ac457a\n"
    }
  ],
  "next": "14c858e80dfe2030c9f343dc0c6e2048e030731b"
}