)]}'
{
  "log": [
    {
      "commit": "5ff1dd576bb93c45b44088a51544a18fc43ebf58",
      "tree": "c002dcda87f08329197b01395539bd25f10ca737",
      "parents": [
        "8a08dcc0a5de19a904e77d5f31bed3dff9a59890"
      ],
      "author": {
        "name": "Steve Block",
        "email": "steveblock@google.com",
        "time": "Thu Jan 05 23:22:43 2012 +0000"
      },
      "committer": {
        "name": "Steve Block",
        "email": "steveblock@google.com",
        "time": "Fri Jan 06 10:07:54 2012 +0000"
      },
      "message": "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)  DO NOT MERGE\n\nSee https://android-git.corp.google.com/g/157065\n\nBug: 5449033\nChange-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69\n"
    },
    {
      "commit": "8a08dcc0a5de19a904e77d5f31bed3dff9a59890",
      "tree": "74f1e0437d3431a755c5ee1f2cf2c71d368810ee",
      "parents": [
        "1dcd47537a81fc55db9b48dce7fff7bae8a601d5",
        "df64d15042bbd5e0e4933ac49bf3c177dd94752c"
      ],
      "author": {
        "name": "Steve Block",
        "email": "steveblock@google.com",
        "time": "Thu Jan 05 14:07:02 2012 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Jan 05 14:07:02 2012 -0800"
      },
      "message": "Merge \"Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)  DO NOT MERGE\""
    },
    {
      "commit": "1dcd47537a81fc55db9b48dce7fff7bae8a601d5",
      "tree": "5a1795bd7aefe20d332f7388d8cddcadc3df841a",
      "parents": [
        "88592eccaf6afcddd5f985955be92fe25205c680",
        "22bf648b0b5484834850667664912b660df28585"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu Jan 05 12:08:48 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Jan 05 12:08:48 2012 -0800"
      },
      "message": "am d32ee5ba: Reconcile with ics-mr1-release\n\n* commit \u0027d32ee5baa057992431263907ec5cf8f19b43c043\u0027:\n"
    },
    {
      "commit": "88592eccaf6afcddd5f985955be92fe25205c680",
      "tree": "5a1795bd7aefe20d332f7388d8cddcadc3df841a",
      "parents": [
        "a2a0a5d7d56baa831870f4bf2a0d942a477d92ef",
        "9c56d4ae6212c21ce5fd71ed534eb195983a07c1"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Jan 05 08:20:10 2012 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Jan 05 08:20:10 2012 -0800"
      },
      "message": "Merge \"Remove the notion of \"active track\" from mixer\""
    },
    {
      "commit": "22bf648b0b5484834850667664912b660df28585",
      "tree": "2ffdfd9dbc064aa3d2a9b229f87b679220ef4f79",
      "parents": [
        "fe0698f9d44ca923ff1ba528f2c42019937ea5e2",
        "1c03729ed505d5ad66b72ea6ee921d8bb06245c6"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu Jan 05 07:45:28 2012 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu Jan 05 07:45:28 2012 -0800"
      },
      "message": "Reconcile with ics-mr1-release\n\nChange-Id: I8a74c329fc7dd115e36d5180fab8e8680d6df4f8\n"
    },
    {
      "commit": "a2a0a5d7d56baa831870f4bf2a0d942a477d92ef",
      "tree": "1979692770dd902d0aa7e8c0760e496e13539e5c",
      "parents": [
        "7ab41c9f773ba599646f1b0d00955c1be80f92fd",
        "f6b1678f8f508b447155a81b44e214475ab634a8"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Jan 05 07:38:29 2012 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Jan 05 07:38:29 2012 -0800"
      },
      "message": "Merge \"Use the standard CC_LIKELY and CC_UNLIKELY macros\""
    },
    {
      "commit": "f6b1678f8f508b447155a81b44e214475ab634a8",
      "tree": "dabe2858dfed9133c6a270cd6b86877a9d3588b1",
      "parents": [
        "94023fa6744e24f26f0aba1699ec278649bd66df"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Dec 15 09:51:17 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Jan 05 07:33:45 2012 -0800"
      },
      "message": "Use the standard CC_LIKELY and CC_UNLIKELY macros\n\nSeveral source files privately defined macros LIKELY and UNLIKELY in terms\nof __builtin_expect. But \u003ccutils/compiler.h\u003e already has CC_LIKELY and\nCC_UNLIKELY which are intended for this purpose.  So rename the private\nuses to use the standard names.\n\nIn addition, AudioFlinger was relying on the macro expanding to extra ( ).\n\nChange-Id: I2494e087a0c0cac0ac998335f5e9c8ad02955873\n"
    },
    {
      "commit": "7ab41c9f773ba599646f1b0d00955c1be80f92fd",
      "tree": "02a8e0276a550d6748b64e6b4e165dd562712859",
      "parents": [
        "b8a805261bf0282e992d3608035e47d05a898710",
        "fe0698f9d44ca923ff1ba528f2c42019937ea5e2"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Jan 04 17:39:12 2012 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Jan 04 17:39:12 2012 -0800"
      },
      "message": "resolved conflicts for merge of 1a4b9939 to master\n\nChange-Id: I0c910d391a38a916d8431f7d1f5b82e39e1a66c2\n"
    },
    {
      "commit": "1c03729ed505d5ad66b72ea6ee921d8bb06245c6",
      "tree": "2ffdfd9dbc064aa3d2a9b229f87b679220ef4f79",
      "parents": [
        "071ccd5a9702500f3f7d62ef881300914926184d",
        "fee0357bd06bb261c26c6030df45db8e1b2a1b73"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Wed Jan 04 16:42:23 2012 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Wed Jan 04 16:42:23 2012 -0800"
      },
      "message": "merge in ics-mr1-release history after reset to ics-mr1\n"
    },
    {
      "commit": "fe0698f9d44ca923ff1ba528f2c42019937ea5e2",
      "tree": "2ffdfd9dbc064aa3d2a9b229f87b679220ef4f79",
      "parents": [
        "183c525aee3b683f6d92b0b6e7197a3989ddee1a",
        "071ccd5a9702500f3f7d62ef881300914926184d"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Jan 04 13:00:49 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 04 13:00:49 2012 -0800"
      },
      "message": "am fb578b6b: Merge \"audioflinger: fix clicks on 48kHz audio.\" into ics-mr1\n\n* commit \u0027fb578b6b88af51812b71a86ad4dd3a7de56e394b\u0027:\n  audioflinger: fix clicks on 48kHz audio.\n"
    },
    {
      "commit": "df64d15042bbd5e0e4933ac49bf3c177dd94752c",
      "tree": "ff04eb3e1a1ce8c8d8559b93a438f278d984aa87",
      "parents": [
        "b8a805261bf0282e992d3608035e47d05a898710"
      ],
      "author": {
        "name": "Steve Block",
        "email": "steveblock@google.com",
        "time": "Wed Jan 04 20:05:49 2012 +0000"
      },
      "committer": {
        "name": "Steve Block",
        "email": "steveblock@google.com",
        "time": "Wed Jan 04 20:05:49 2012 +0000"
      },
      "message": "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)  DO NOT MERGE\n\nSee https://android-git.corp.google.com/g/156801\n\nBug: 5449033\nChange-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea\n"
    },
    {
      "commit": "b8a805261bf0282e992d3608035e47d05a898710",
      "tree": "7a43908b8e936ac1f30eef0542b40d667c47aa23",
      "parents": [
        "94023fa6744e24f26f0aba1699ec278649bd66df"
      ],
      "author": {
        "name": "Steve Block",
        "email": "steveblock@google.com",
        "time": "Tue Dec 20 16:23:08 2011 +0000"
      },
      "committer": {
        "name": "Steve Block",
        "email": "steveblock@google.com",
        "time": "Tue Jan 03 22:38:27 2012 +0000"
      },
      "message": "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)  DO NOT MERGE\n\nSee https://android-git.corp.google.com/g/156016\n\nBug: 5449033\nChange-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298\n"
    },
    {
      "commit": "071ccd5a9702500f3f7d62ef881300914926184d",
      "tree": "2ffdfd9dbc064aa3d2a9b229f87b679220ef4f79",
      "parents": [
        "69aac3e6cd68e8c305a41b2677123db7662efd4b"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Dec 22 16:08:41 2011 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Dec 22 16:08:41 2011 -0800"
      },
      "message": "audioflinger: fix clicks on 48kHz audio.\n\nThe calculation done in prepareTracks_l() for the minimum amount\noff frames needed to mix one output buffer had 2 issues:\n- the additional sample needed for interpolation was not included\n- the fact that the resampler does not acknowledge the frames consumed\nimmediately after each mixing round but only once all frames requested have been used\nwas not taken into account.\nThus the number of frames available in track buffer could be considered sufficient although\nit was not and the resampler would abort producing a short silence perceived as a click.\n\nIssue 5727099.\n\nChange-Id: I7419847a7474c7d9f9170bedd0a636132262142c\n"
    },
    {
      "commit": "9c56d4ae6212c21ce5fd71ed534eb195983a07c1",
      "tree": "417c958c4fd243f4edb7bc765f4dc1e709456ddc",
      "parents": [
        "bbaf8673f1d1dd79d1b7f474ca7111da58e84aff"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Mon Dec 19 15:06:39 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Dec 20 16:29:21 2011 -0800"
      },
      "message": "Remove the notion of \"active track\" from mixer\n\nThis is a first step towards making the mixer more object-oriented.\n\nChange-Id: Ifd445d0e471023a7f5c82e934736ffc95ba1b05b\n"
    },
    {
      "commit": "94023fa6744e24f26f0aba1699ec278649bd66df",
      "tree": "a0184b1a6a55a924143411129a4cd13d9dbcaa08",
      "parents": [
        "12d9702773c8a3242a44dd6528126c9ff0dade43",
        "183c525aee3b683f6d92b0b6e7197a3989ddee1a"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Dec 20 13:11:53 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Dec 20 13:11:53 2011 -0800"
      },
      "message": "am 21cb1290: Reconcile with ics-mr1-release\n\n* commit \u002721cb1290b578a4bceac003c276c00911fcd6c9d4\u0027:\n"
    },
    {
      "commit": "183c525aee3b683f6d92b0b6e7197a3989ddee1a",
      "tree": "c5f62a947aa04afb4e3f5f8f8ddbb569ff8fa0c0",
      "parents": [
        "a9798d3c1f1c9787975dc0f16e2191da95f2f0da",
        "fee0357bd06bb261c26c6030df45db8e1b2a1b73"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Dec 20 13:08:33 2011 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Dec 20 13:08:33 2011 -0800"
      },
      "message": "Reconcile with ics-mr1-release\n\nChange-Id: I123bd5ae61ab8c4f6de1a6640faf0bab89f6aa78\n"
    },
    {
      "commit": "12d9702773c8a3242a44dd6528126c9ff0dade43",
      "tree": "a0184b1a6a55a924143411129a4cd13d9dbcaa08",
      "parents": [
        "bbaf8673f1d1dd79d1b7f474ca7111da58e84aff",
        "81a028fef62bcadf13fc8550067a3d29c918b3ca"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Dec 20 10:29:49 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Dec 20 10:29:49 2011 -0800"
      },
      "message": "Merge \"Remove dead code\""
    },
    {
      "commit": "bbaf8673f1d1dd79d1b7f474ca7111da58e84aff",
      "tree": "e62a99d53b941551e306507e9d894cd754653d4c",
      "parents": [
        "e78950e714e57767b54a836e22924212cfbf5f5f",
        "3d5188bd6abe55898f10a0edf3c05aff8aa2ef67"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon Dec 19 17:26:24 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Dec 19 17:26:24 2011 -0800"
      },
      "message": "Merge \"audio effects: rename configure command\""
    },
    {
      "commit": "3d5188bd6abe55898f10a0edf3c05aff8aa2ef67",
      "tree": "7dd2eba6d9a65d42628ffe55d12e640776285035",
      "parents": [
        "42968939dfce0954d6540011199045ec4ed7de80"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Fri Dec 16 15:30:36 2011 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon Dec 19 17:08:31 2011 -0800"
      },
      "message": "audio effects: rename configure command\n\nRenamed audio effect library interface command for audio format\nconfiguration from EFFECT_CMD_CONFIGURE to EFFECT_CMD_SET_CONFIG.\nThis makes the naming more consistent with other exixsting commands\nand allow adding a new command to get the configuration (EFFECT_CMD_GET_CONFIG).\nSame change for reverse channel configuration renamed from\nEFFECT_CMD_CONFIGURE_REVERSE to EFFECT_CMD_SET_CONFIG_REVERSE.\n\nImplemented EFFECT_CMD_GET_CONFIG in exisitng effect libraries.\n\nChange-Id: Ia7b1c620f13797fe5aceb3b0b4acbacce09fb067\n"
    },
    {
      "commit": "81a028fef62bcadf13fc8550067a3d29c918b3ca",
      "tree": "9d2c12b20abcf5e1aad3522678e685b173db776b",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Dec 15 09:53:12 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Mon Dec 19 15:55:47 2011 -0800"
      },
      "message": "Remove dead code\n\nChange-Id: Icf23f7f90fdeb660f4015f22cf239e6d05f5d03c\n"
    },
    {
      "commit": "e78950e714e57767b54a836e22924212cfbf5f5f",
      "tree": "ef7fa55057dfc3e28102fb2fe554b78d016d1f3d",
      "parents": [
        "f602a5f7f29e694a7da4c143737b74501c00477d",
        "8d0dd8b46163ec7b42e2051c441ae2bf96dd9aec"
      ],
      "author": {
        "name": "Hong Teng",
        "email": "hongteng@google.com",
        "time": "Fri Dec 16 15:17:46 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Dec 16 15:17:46 2011 -0800"
      },
      "message": "Merge \"Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test failed.\""
    },
    {
      "commit": "f602a5f7f29e694a7da4c143737b74501c00477d",
      "tree": "c7edef89cc88918b8cb04168253664470de77036",
      "parents": [
        "d1e672acd8fa1af899f85ee2321327237028adf8",
        "bf71f1e7948406492376c6cbd5e6a30c8cb670e4"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Dec 16 15:10:36 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Dec 16 15:10:36 2011 -0800"
      },
      "message": "Merge \"Use constants for 2 and 32\""
    },
    {
      "commit": "d1e672acd8fa1af899f85ee2321327237028adf8",
      "tree": "bdcc71f510c339222d386c07a0e40121f1ab15b9",
      "parents": [
        "b92bc47a05925c29efef0d66711b6d3f17f406e7",
        "3b21c50ef95fe4e7ac3426ca14b365749e66ff08"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Dec 16 15:02:30 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Dec 16 15:02:30 2011 -0800"
      },
      "message": "Merge \"Extract out audio DSP code to utility library\""
    },
    {
      "commit": "bf71f1e7948406492376c6cbd5e6a30c8cb670e4",
      "tree": "077a8a894c95655353bd5ffec7c4c93f1d36b9be",
      "parents": [
        "b92bc47a05925c29efef0d66711b6d3f17f406e7"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Dec 13 11:52:35 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Dec 16 14:55:05 2011 -0800"
      },
      "message": "Use constants for 2 and 32\n\nChange-Id: If820dfd58b6df258570750610a07af99598d9e53\n"
    },
    {
      "commit": "8d0dd8b46163ec7b42e2051c441ae2bf96dd9aec",
      "tree": "5f1fd9dc97c8c21c1804a14c50a636b4b2ab01ba",
      "parents": [
        "079123ee3d2e20bbc17a7ddbd96ca46bed27898f"
      ],
      "author": {
        "name": "Hong Teng",
        "email": "hongteng@google.com",
        "time": "Thu Dec 15 16:56:49 2011 -0800"
      },
      "committer": {
        "name": "Hong Teng",
        "email": "hongteng@google.com",
        "time": "Fri Dec 16 14:32:59 2011 -0800"
      },
      "message": "Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test failed.\n\n-Fix the index is out of sync frame array boundary when seeking to end of a 3gp file.\nValidation only were done for video editor cts test and Movie Studio application.\nFuther validation may include media player, youtube application,.etc.\n\nChange-Id: Ib01314f1768cfab702dbe25c307553ace0b85e77\n"
    },
    {
      "commit": "b92bc47a05925c29efef0d66711b6d3f17f406e7",
      "tree": "2e953cde5bf4b7ca0bc45cdf33cc78044660309f",
      "parents": [
        "237a624f674800d2300806b115eee8c9bb7db033",
        "788040c5189bbdaf567ce4b29ffd1db08ea1020c"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Dec 16 13:31:33 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Dec 16 13:31:33 2011 -0800"
      },
      "message": "Merge \"Use switch in AudioMixer::setParameter\""
    },
    {
      "commit": "788040c5189bbdaf567ce4b29ffd1db08ea1020c",
      "tree": "75cf254063bf823fd2e5ff6c3504ecc2c37bb488",
      "parents": [
        "154a7fbda9b704bc1d23b6f17573016ebb5989be"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu May 05 08:19:00 2011 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Dec 16 13:28:33 2011 -0800"
      },
      "message": "Use switch in AudioMixer::setParameter\n\nReplace series of if/then/elses by easier-to-read switch.  Also return\nvoid instead of status_t, since callers weren\u0027t checking it. Assert on\nbad input parameters.\n\nChange-Id: Ie1f0a297977b28501d20e1af819afed9b4750616\n"
    },
    {
      "commit": "237a624f674800d2300806b115eee8c9bb7db033",
      "tree": "edf7370358ef705903fe8ba8abfb7f0103d76ed5",
      "parents": [
        "154a7fbda9b704bc1d23b6f17573016ebb5989be"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Dec 15 15:32:27 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Dec 16 13:22:41 2011 -0800"
      },
      "message": "deleteTrackName now asserts on bad input parameter\n\nThis is safe, as the input parameter is always track-\u003ename(),\nwhich must be valid.\n\nChange-Id: Iea8ea3a5706c27026335526ba8851030d00681f8\n"
    },
    {
      "commit": "fee0357bd06bb261c26c6030df45db8e1b2a1b73",
      "tree": "c5f62a947aa04afb4e3f5f8f8ddbb569ff8fa0c0",
      "parents": [
        "69aac3e6cd68e8c305a41b2677123db7662efd4b",
        "f61ea45c823814371c8ced71a4023f9b2cd05a3b"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Fri Dec 16 12:01:35 2011 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Fri Dec 16 12:01:35 2011 -0800"
      },
      "message": "merge in ics-mr1-release history after reset to ics-mr1\n"
    },
    {
      "commit": "3b21c50ef95fe4e7ac3426ca14b365749e66ff08",
      "tree": "e3f9a8d6ab695bd1d4d494fbf1b9d80bcc25585c",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Dec 15 09:52:39 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Dec 16 11:42:03 2011 -0800"
      },
      "message": "Extract out audio DSP code to utility library\n\nChange-Id: Ib8ce72028a7ea30e82baa518e381370e820ebbd0\n"
    },
    {
      "commit": "154a7fbda9b704bc1d23b6f17573016ebb5989be",
      "tree": "213424db0d71f1de94ea2789d272595287664bf6",
      "parents": [
        "6d4bf6eda04888144ec59cba4816a2cbb79b9e5c",
        "a9798d3c1f1c9787975dc0f16e2191da95f2f0da"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Dec 16 08:09:57 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Dec 16 08:09:57 2011 -0800"
      },
      "message": "am 57ea96a4: Reconcile with ics-mr1-release\n\n* commit \u002757ea96a4b3273aa8592873355a2f79c74b1abec1\u0027:\n  SurfaceMediaSource: use the HW_TEXTURE usage bit\n  SurfaceMediaSource: use the HW_TEXTURE usage bit\n"
    },
    {
      "commit": "a9798d3c1f1c9787975dc0f16e2191da95f2f0da",
      "tree": "c5f62a947aa04afb4e3f5f8f8ddbb569ff8fa0c0",
      "parents": [
        "7e2f99569ae7d22307957abecc2e1818b4e7ab5e",
        "f61ea45c823814371c8ced71a4023f9b2cd05a3b"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Dec 16 08:08:07 2011 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Dec 16 08:08:07 2011 -0800"
      },
      "message": "Reconcile with ics-mr1-release\n\nChange-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da\n"
    },
    {
      "commit": "6d4bf6eda04888144ec59cba4816a2cbb79b9e5c",
      "tree": "213424db0d71f1de94ea2789d272595287664bf6",
      "parents": [
        "b87c068727a15a3d3f0bfdcb758c76a097f5e869",
        "fba380a0b2c62684ce4272a05165965bae29d6a1"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Dec 16 07:30:14 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Dec 16 07:30:14 2011 -0800"
      },
      "message": "Merge \"setActiveTrack and setBufferProvider can\u0027t fail\""
    },
    {
      "commit": "b87c068727a15a3d3f0bfdcb758c76a097f5e869",
      "tree": "49768247c538c838564c4546bc55cb3df572b56f",
      "parents": [
        "255adceb85bc23de61fb138ddb474852514b3b33",
        "1c48c3c61970527b97892ab6a2daae8eaac26964"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Dec 16 07:29:57 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Dec 16 07:29:57 2011 -0800"
      },
      "message": "Merge \"Simplify enable/disable mixing\""
    },
    {
      "commit": "f61ea45c823814371c8ced71a4023f9b2cd05a3b",
      "tree": "c5f62a947aa04afb4e3f5f8f8ddbb569ff8fa0c0",
      "parents": [
        "44beb98b085f8e221fbe471523e69a0d174704b4"
      ],
      "author": {
        "name": "Jamie Gennis",
        "email": "jgennis@google.com",
        "time": "Thu Dec 15 18:14:05 2011 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Thu Dec 15 20:52:26 2011 -0800"
      },
      "message": "SurfaceMediaSource: use the HW_TEXTURE usage bit\n\nThis change makes SurfaceMediaSource request Gralloc buffers with the\nHW_TEXTURE usage bit rather than the VIDEO_ENCODER bit.  It is a\ntemporary workaround for what is likely a Gralloc bug.\n\nBug: 5771063\nChange-Id: I9cce615e80fc14a1644fae27ba06970c262dd179\n"
    },
    {
      "commit": "44beb98b085f8e221fbe471523e69a0d174704b4",
      "tree": "52cb291bf974f4593277cc1142e514ebadae4b89",
      "parents": [
        "b5aaa4a4d8f3c6f8be574b6ad8bd20fb74da6b9c"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Thu Dec 15 20:50:02 2011 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Thu Dec 15 20:50:02 2011 -0800"
      },
      "message": "merge in ics-mr1-release history after reset to ics-mr1\n"
    },
    {
      "commit": "b5aaa4a4d8f3c6f8be574b6ad8bd20fb74da6b9c",
      "tree": "c5f62a947aa04afb4e3f5f8f8ddbb569ff8fa0c0",
      "parents": [
        "8df7a98161a07f2348f292f7691887bbb8293fef"
      ],
      "author": {
        "name": "Jamie Gennis",
        "email": "jgennis@google.com",
        "time": "Thu Dec 15 18:14:05 2011 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Thu Dec 15 20:18:19 2011 -0800"
      },
      "message": "SurfaceMediaSource: use the HW_TEXTURE usage bit\n\nThis change makes SurfaceMediaSource request Gralloc buffers with the\nHW_TEXTURE usage bit rather than the VIDEO_ENCODER bit.  It is a\ntemporary workaround for what is likely a Gralloc bug.\n\nBug: 5771063\nChange-Id: I9cce615e80fc14a1644fae27ba06970c262dd179\n"
    },
    {
      "commit": "255adceb85bc23de61fb138ddb474852514b3b33",
      "tree": "792f55bb343fc5f989e7f5d110194da4a57dd651",
      "parents": [
        "079123ee3d2e20bbc17a7ddbd96ca46bed27898f",
        "7e2f99569ae7d22307957abecc2e1818b4e7ab5e"
      ],
      "author": {
        "name": "Dave Burke",
        "email": "daveburke@google.com",
        "time": "Thu Dec 15 19:27:17 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Dec 15 19:27:17 2011 -0800"
      },
      "message": "am 0cc1e42d: am ac279de9: Merge \"SurfaceMediaSource: use the HW_TEXTURE usage bit\" into ics-mr1\n\n* commit \u00270cc1e42d74e09c259a6da0abc9009d1abf7537b1\u0027:\n  SurfaceMediaSource: use the HW_TEXTURE usage bit\n"
    },
    {
      "commit": "7e2f99569ae7d22307957abecc2e1818b4e7ab5e",
      "tree": "c5f62a947aa04afb4e3f5f8f8ddbb569ff8fa0c0",
      "parents": [
        "3453bf678e3d0187015cdde1c9263299ea361726",
        "69aac3e6cd68e8c305a41b2677123db7662efd4b"
      ],
      "author": {
        "name": "Dave Burke",
        "email": "daveburke@google.com",
        "time": "Thu Dec 15 19:25:07 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Dec 15 19:25:07 2011 -0800"
      },
      "message": "am ac279de9: Merge \"SurfaceMediaSource: use the HW_TEXTURE usage bit\" into ics-mr1\n\n* commit \u0027ac279de9d9fcfd59a336298cfdd5b1f4ab6d038f\u0027:\n  SurfaceMediaSource: use the HW_TEXTURE usage bit\n"
    },
    {
      "commit": "69aac3e6cd68e8c305a41b2677123db7662efd4b",
      "tree": "c5f62a947aa04afb4e3f5f8f8ddbb569ff8fa0c0",
      "parents": [
        "785ee06d106cd7958e0c151ebc6b7174d9ba861e"
      ],
      "author": {
        "name": "Jamie Gennis",
        "email": "jgennis@google.com",
        "time": "Thu Dec 15 18:14:05 2011 -0800"
      },
      "committer": {
        "name": "Jamie Gennis",
        "email": "jgennis@google.com",
        "time": "Thu Dec 15 18:36:08 2011 -0800"
      },
      "message": "SurfaceMediaSource: use the HW_TEXTURE usage bit\n\nThis change makes SurfaceMediaSource request Gralloc buffers with the\nHW_TEXTURE usage bit rather than the VIDEO_ENCODER bit.  It is a\ntemporary workaround for what is likely a Gralloc bug.\n\nBug: 5771063\nChange-Id: I9cce615e80fc14a1644fae27ba06970c262dd179\n"
    },
    {
      "commit": "079123ee3d2e20bbc17a7ddbd96ca46bed27898f",
      "tree": "452b1e2ab8e52c04819242c5517c5ed242c2ccdd",
      "parents": [
        "26fa039c3752eaaf74d1be53d9795f48e9f43de3",
        "f3990f2cc8fd824ae52a880a7b22248e1bdfb192"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Dec 15 16:17:04 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Dec 15 16:17:04 2011 -0800"
      },
      "message": "Merge \"Improve resistance to leaks for ConfigEvent\""
    },
    {
      "commit": "26fa039c3752eaaf74d1be53d9795f48e9f43de3",
      "tree": "cb76ba4c46c218fec35f88e47a963c93e0bb175b",
      "parents": [
        "2a8ce907a57f30ffa336a024e09752794d08ec1a",
        "e0feee3da22beeffbd9357540e265f13b2119cbb"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Dec 15 16:16:55 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Dec 15 16:16:55 2011 -0800"
      },
      "message": "Merge \"Use NULL not 0 for pointers\""
    },
    {
      "commit": "fba380a0b2c62684ce4272a05165965bae29d6a1",
      "tree": "d0a89a2c45aa09a838c5f93108a3be8f5a80d4e5",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Dec 15 15:46:46 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Dec 15 15:55:51 2011 -0800"
      },
      "message": "setActiveTrack and setBufferProvider can\u0027t fail\n\nReturn void, not status_t, from setActiveTrack and setBufferProvider.\n\nThese methods returned status_t, but the callers never checked the\nreturn value.  Since these aren\u0027t externally visible APIs, they now\nreturn void, and assert on bad input parameters.\n\nChange-Id: I530ed29484596ae41e8659826ca425149c51c2a1\n"
    },
    {
      "commit": "1c48c3c61970527b97892ab6a2daae8eaac26964",
      "tree": "24fed87db69fcce3fb6f3b01bb72501445102c04",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Dec 15 14:54:01 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Dec 15 15:00:28 2011 -0800"
      },
      "message": "Simplify enable/disable mixing\n\nThe MIXING enum isn\u0027t needed, and now returns void instead of status_t.\n\nChange-Id: Ibe4ec24081d75ad4ab78b9c7191fc9077959c4e9\n"
    },
    {
      "commit": "f3990f2cc8fd824ae52a880a7b22248e1bdfb192",
      "tree": "e411cbecc6eb0511a485844e1827a5b4aa770d81",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Dec 13 11:50:00 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Dec 15 12:51:52 2011 -0800"
      },
      "message": "Improve resistance to leaks for ConfigEvent\n\nA Vector of pointers is risky, as there is no ownership (and the\nThreadBase destructor was not deleting them, so if there were any left\nover at end it would leak).  Replaced by a Vector of values.\n\nChange-Id: Iddde72dc30134adfcf724dec26cbe0a742509b8c\n"
    },
    {
      "commit": "2a8ce907a57f30ffa336a024e09752794d08ec1a",
      "tree": "fce5afddda0f1c0a7d310234494fcf6ae0d3d07e",
      "parents": [
        "42968939dfce0954d6540011199045ec4ed7de80",
        "a9960bcb176c58bd9d5f9062b84437a59fff875e"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Dec 15 10:46:14 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Dec 15 10:46:14 2011 -0800"
      },
      "message": "Merge \"Fix build error when verbose logging is enabled\""
    },
    {
      "commit": "e0feee3da22beeffbd9357540e265f13b2119cbb",
      "tree": "6b4d02fc40687bbc8b463acd659e147d084f0883",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Dec 13 11:53:26 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Dec 15 09:18:17 2011 -0800"
      },
      "message": "Use NULL not 0 for pointers\n\nChange-Id: Iab3f9abbdab617dc5a599e657ec46a0b0a002eef\n"
    },
    {
      "commit": "a9960bcb176c58bd9d5f9062b84437a59fff875e",
      "tree": "e6942825c6f708eb0244905038a6e90d73806175",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Dec 15 08:27:40 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Dec 15 08:34:59 2011 -0800"
      },
      "message": "Fix build error when verbose logging is enabled\n\nChange-Id: I30f4e5d35d1b24dce2e6152a13fd0fb61414a3e2\n"
    },
    {
      "commit": "8df7a98161a07f2348f292f7691887bbb8293fef",
      "tree": "52cb291bf974f4593277cc1142e514ebadae4b89",
      "parents": [
        "785ee06d106cd7958e0c151ebc6b7174d9ba861e",
        "d2bc4e0683eb6d1b7ac9731cc27ab46dc3e016af"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Wed Dec 14 22:14:25 2011 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Wed Dec 14 22:14:25 2011 -0800"
      },
      "message": "merge in ics-mr1-release history after reset to ics-mr1\n"
    },
    {
      "commit": "42968939dfce0954d6540011199045ec4ed7de80",
      "tree": "0e297b59294db0688bab53cad567bb235f3ec4df",
      "parents": [
        "a06a9a50b37d60e9c43c9de9f8ea3a8649cd5691",
        "c5ac4cb3a5124860ccfc7e4ff66251c55a5595ca"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 17:35:36 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Dec 14 17:35:36 2011 -0800"
      },
      "message": "Merge \"Fix indentation and whitespace\""
    },
    {
      "commit": "a06a9a50b37d60e9c43c9de9f8ea3a8649cd5691",
      "tree": "90ae67082dc5ff77567a75178b2a441d6df617ec",
      "parents": [
        "53a166cabc956529d2336b04c26b9c03b550ab38",
        "d879601ace079e3c0aed79cf3fa5fb4db6ad4a9f"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 17:35:23 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Dec 14 17:35:24 2011 -0800"
      },
      "message": "Merge \"Improve AudioFlinger error logging\""
    },
    {
      "commit": "53a166cabc956529d2336b04c26b9c03b550ab38",
      "tree": "78d99a44c8a08746e288e09b7cc04bc5f60f6c29",
      "parents": [
        "2eda60a8485cfe70a60e72156beffdc470ecb093",
        "0cfd8231e4c489392809bf44c174315df2690145"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 17:35:14 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Dec 14 17:35:14 2011 -0800"
      },
      "message": "Merge \"AudioMixer uninitialized simple fields\""
    },
    {
      "commit": "0cfd8231e4c489392809bf44c174315df2690145",
      "tree": "37cf11873d8a71cd563fbe933dc7daab85406283",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Dec 13 11:58:23 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 17:25:28 2011 -0800"
      },
      "message": "AudioMixer uninitialized simple fields\n\nChange-Id: I47e3849f048d4d990c9634f9c8a2ca2de0339e93\n"
    },
    {
      "commit": "d879601ace079e3c0aed79cf3fa5fb4db6ad4a9f",
      "tree": "9acd00abfef7033fc5d133ad8f5336dfbf5e77de",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Oct 28 10:31:42 2011 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 17:22:40 2011 -0800"
      },
      "message": "Improve AudioFlinger error logging\n\nChange-Id: I8ce9aff4038cd7fa0067600faa8080b137db1939\n"
    },
    {
      "commit": "2eda60a8485cfe70a60e72156beffdc470ecb093",
      "tree": "bd491ab0f798c707b6bade7051f0d9e0cba23337",
      "parents": [
        "f7d4ae9149a1fa4fa97ee0ba97652e28ed92b297",
        "362c4e697d8e9c034e964ac7b40227e054491547"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 16:56:31 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Dec 14 16:56:31 2011 -0800"
      },
      "message": "Merge \"Audio C++ comments\""
    },
    {
      "commit": "c5ac4cb3a5124860ccfc7e4ff66251c55a5595ca",
      "tree": "8b5320023ea729a043b00157e5ba528b4276e700",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Mon Dec 12 09:05:55 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 16:54:05 2011 -0800"
      },
      "message": "Fix indentation and whitespace\n\nUse git diff -w to verify.\n\nChange-Id: Ib65be0a1ecf65d6cad516110604e3855bf68a638\n"
    },
    {
      "commit": "f7d4ae9149a1fa4fa97ee0ba97652e28ed92b297",
      "tree": "583306b211bc854994c52b4f8667726de210d9ef",
      "parents": [
        "1d334101f1289cf4c8967af6e78ac22619175982",
        "3453bf678e3d0187015cdde1c9263299ea361726"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Dec 14 16:08:46 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Dec 14 16:08:46 2011 -0800"
      },
      "message": "am b14436d0: Reconcile with ics-mr1-release\n\n* commit \u0027b14436d0700f6e837e4d6066ddcf672c61d7f033\u0027:\n  Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert \"Fix drm flag setting missed in false drm recognition fix.\"    This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.\n"
    },
    {
      "commit": "3453bf678e3d0187015cdde1c9263299ea361726",
      "tree": "52cb291bf974f4593277cc1142e514ebadae4b89",
      "parents": [
        "26c2a6bf34b370d467cab4753e5a4b187ba62c0f",
        "d2bc4e0683eb6d1b7ac9731cc27ab46dc3e016af"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Dec 14 16:05:32 2011 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Wed Dec 14 16:05:32 2011 -0800"
      },
      "message": "Reconcile with ics-mr1-release\n\nChange-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7\n"
    },
    {
      "commit": "d2bc4e0683eb6d1b7ac9731cc27ab46dc3e016af",
      "tree": "52cb291bf974f4593277cc1142e514ebadae4b89",
      "parents": [
        "e4fe3a4f41f296ac0471152542fcfd904ee50b0e"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Dec 14 10:57:05 2011 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Wed Dec 14 15:44:42 2011 -0800"
      },
      "message": "Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck\n1. Revert \"Fix drm flag setting missed in false drm recognition fix.\"\n   This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.\n\n2. Revert \"Fixed the false drm recognition.\"\n   This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230.\n\n3. Revert \"Fix drm enumeration order, resolves failure to play forward lock ringtones\"\n   This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369.\n\n4. Revert \"Fix ANRs due to Widevine DRM plugin sniff taking too long.\"\n   This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9.\n\nAs a result of the reverting, many ANRs from WV sniffing are back.\n\nrelated-to-bug: 5739618\n"
    },
    {
      "commit": "1d334101f1289cf4c8967af6e78ac22619175982",
      "tree": "583306b211bc854994c52b4f8667726de210d9ef",
      "parents": [
        "c23bd9b5b9e4be9c395789810fdd8522296fc50c",
        "9054897ab9ffb307fadae81b774a1fc61cb542e7"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 15:40:43 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Dec 14 15:40:43 2011 -0800"
      },
      "message": "Merge \"Remove unnecessary this-\u003e\""
    },
    {
      "commit": "c23bd9b5b9e4be9c395789810fdd8522296fc50c",
      "tree": "467f140c2c825f503964323235f635370eb8845c",
      "parents": [
        "e5dfcd8c6792c4b64120fd03708729b70a887f2a",
        "ec1d6b5e17281a066d618f7fcd2b63b3ce11f421"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 15:40:35 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Dec 14 15:40:35 2011 -0800"
      },
      "message": "Merge \"Use const char correctly in AudioFlinger\""
    },
    {
      "commit": "e5dfcd8c6792c4b64120fd03708729b70a887f2a",
      "tree": "1b6910473934e744ac9c7cd5ce0d06269ab5217f",
      "parents": [
        "738ed42488491b740e73c0cddc2f257af17b638d",
        "7dede876998ff56351d495ec3a798c1b131193e8"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 15:40:27 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Dec 14 15:40:27 2011 -0800"
      },
      "message": "Merge \"Use units after all times\""
    },
    {
      "commit": "738ed42488491b740e73c0cddc2f257af17b638d",
      "tree": "050ee2a1210326c289c5436943299f519548d5e3",
      "parents": [
        "b299dc4ded29a226daac07f195d1558e660d2f9f",
        "837b8184e1307991578de5d5d25b62a67bb225f6"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 15:40:11 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Dec 14 15:40:11 2011 -0800"
      },
      "message": "Merge \"Delete obsolete includes\""
    },
    {
      "commit": "b299dc4ded29a226daac07f195d1558e660d2f9f",
      "tree": "6624976ec87c6d7964497393d2c0ef7c71dd2375",
      "parents": [
        "505c529b2be910a7c5a814799b2e65af4b5dc941",
        "91eb8bfbe253a6b6fe1aa23fb884a601c28991c4"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 15:40:01 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Dec 14 15:40:01 2011 -0800"
      },
      "message": "Merge \"Remove redundant clear()\""
    },
    {
      "commit": "505c529b2be910a7c5a814799b2e65af4b5dc941",
      "tree": "ed8039bfc0d47285c3c38c60f3e79d64f5fd2e49",
      "parents": [
        "2135dad4a542e4702e4b2d87f0eb05571ff64b57",
        "d1d8f23dde239289ba8c0de0944baaca3586c880"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 15:39:52 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Dec 14 15:39:52 2011 -0800"
      },
      "message": "Merge \"Fix includes\""
    },
    {
      "commit": "2135dad4a542e4702e4b2d87f0eb05571ff64b57",
      "tree": "f734fc4ddf2ad970b3d0c807cbe754e3c68889dd",
      "parents": [
        "2a3d6e1b6cfd2d564a48371598fdc664ea40fa8c",
        "f0c495012bad92230604a9a12a907812ec49ee8f"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 15:05:56 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Dec 14 15:05:56 2011 -0800"
      },
      "message": "Merge \"AudioTrack::setVolume check range\""
    },
    {
      "commit": "362c4e697d8e9c034e964ac7b40227e054491547",
      "tree": "dde3ca3f11e00cc82f1b6a6bd7ebe7b1c24421c5",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 10:28:06 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 14:38:26 2011 -0800"
      },
      "message": "Audio C++ comments\n\nChange-Id: I84906ebb9dfcfa5b96b287d18364b407f02a30c1\n"
    },
    {
      "commit": "2a3d6e1b6cfd2d564a48371598fdc664ea40fa8c",
      "tree": "a1031e278f98ee35c02b14f322e4f1f0c60ae9e1",
      "parents": [
        "5805f995ef365bf00fcccd5c1f948086c17ec75e",
        "26c2a6bf34b370d467cab4753e5a4b187ba62c0f"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Dec 14 13:53:31 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Dec 14 13:53:31 2011 -0800"
      },
      "message": "am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert \"Fix drm flag setting missed in false drm recognition fix.\"    This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.\n\n* commit \u00273f6a7d1ee961a4544563932b7499535dc1cac1ec\u0027:\n  Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert \"Fix drm flag setting missed in false drm recognition fix.\"    This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.\n"
    },
    {
      "commit": "26c2a6bf34b370d467cab4753e5a4b187ba62c0f",
      "tree": "52cb291bf974f4593277cc1142e514ebadae4b89",
      "parents": [
        "50845c903200fbf5e1e61012376516931e945e4c",
        "785ee06d106cd7958e0c151ebc6b7174d9ba861e"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Dec 14 13:50:08 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Dec 14 13:50:08 2011 -0800"
      },
      "message": "am d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert \"Fix drm flag setting missed in false drm recognition fix.\"    This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.\n\n* commit \u0027d70c64db9f67dbe8f888de6b1bdcc835226ec526\u0027:\n  Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert \"Fix drm flag setting missed in false drm recognition fix.\"    This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.\n"
    },
    {
      "commit": "d1d8f23dde239289ba8c0de0944baaca3586c880",
      "tree": "ceacf0750fdfd6dcaab6f9c690a988a9156811ea",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Jul 08 09:34:50 2011 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 13:33:51 2011 -0800"
      },
      "message": "Fix includes\n\nRemove unused #include dlfcn.h\n\nAdd #include String8.h\nForward class declaration is only for references and pointers.\nIn this case, we need the full class declaration,\nand were incorrectly depending on another header file to do it.\n\nChange-Id: Iff65cceb3982698cc1ebaeec405695fc190c03ff\n"
    },
    {
      "commit": "91eb8bfbe253a6b6fe1aa23fb884a601c28991c4",
      "tree": "9afffafed1fc4902515e81f8a30e4f082ef3966d",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Dec 13 11:23:47 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 13:31:40 2011 -0800"
      },
      "message": "Remove redundant clear()\n\nChange-Id: Ie5e4e63cbc8fa85ef50451dddf8f149fa864b132\n"
    },
    {
      "commit": "ec1d6b5e17281a066d618f7fcd2b63b3ce11f421",
      "tree": "351a2c6eea3f7f3934c9df1d67fa08b92a6d6576",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Mon Dec 12 09:04:45 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 13:14:22 2011 -0800"
      },
      "message": "Use const char correctly in AudioFlinger\n\nUse const char [] instead of const char * to eliminate unnecessary pointer.\nMake the array audio_interfaces also const, in addition to the strings.\n\nChange-Id: I31f33d1dcb9a657ee136f4280fd2d46492496831\n"
    },
    {
      "commit": "9054897ab9ffb307fadae81b774a1fc61cb542e7",
      "tree": "b5ef60696ca4730641a76a94aeef912afe97b50e",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Dec 13 11:45:07 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 13:09:08 2011 -0800"
      },
      "message": "Remove unnecessary this-\u003e\n\nChange-Id: I72038f5d4568f0633d3e4ab90f4b67e2dd22c332\n"
    },
    {
      "commit": "f0c495012bad92230604a9a12a907812ec49ee8f",
      "tree": "7bee248d2bc7f9266bdc2d1bdbd35e990be248ba",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Nov 30 09:46:04 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 13:06:57 2011 -0800"
      },
      "message": "AudioTrack::setVolume check range\n\nChange-Id: Ie182bf0f741f1f49f68c02a1e7437a2a34d34fc5\n"
    },
    {
      "commit": "785ee06d106cd7958e0c151ebc6b7174d9ba861e",
      "tree": "52cb291bf974f4593277cc1142e514ebadae4b89",
      "parents": [
        "19e9d0fe6dc3ff4fb1807fee2ad058bf3277e883"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Dec 14 10:57:05 2011 -0800"
      },
      "committer": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Wed Dec 14 11:01:59 2011 -0800"
      },
      "message": "Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck\n1. Revert \"Fix drm flag setting missed in false drm recognition fix.\"\n   This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.\n\n2. Revert \"Fixed the false drm recognition.\"\n   This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230.\n\n3. Revert \"Fix drm enumeration order, resolves failure to play forward lock ringtones\"\n   This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369.\n\n4. Revert \"Fix ANRs due to Widevine DRM plugin sniff taking too long.\"\n   This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9.\n\nAs a result of the reverting, many ANRs from WV sniffing are back.\n\nrelated-to-bug: 5739618\n"
    },
    {
      "commit": "7dede876998ff56351d495ec3a798c1b131193e8",
      "tree": "6b27345d6426ac4ba60dd7fa6e62738a4e406bff",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Dec 13 11:04:14 2011 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 14 09:42:18 2011 -0800"
      },
      "message": "Use units after all times\n\nChange-Id: I48d3f29c37228b5d03189e4c9600824c9360cac9\n"
    },
    {
      "commit": "5805f995ef365bf00fcccd5c1f948086c17ec75e",
      "tree": "ed289e8d756105114a04b35dbef3c027454f49f7",
      "parents": [
        "f4ebe8bdfa7e94d7613a4acfc1fb5f6c747bebd3",
        "50845c903200fbf5e1e61012376516931e945e4c"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Dec 13 19:13:18 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Dec 13 19:13:18 2011 -0800"
      },
      "message": "am 16bdd1e6: Reconcile with ics-mr1-release\n\n* commit \u002716bdd1e65ef19379bbede40c38de2e9f816ba35b\u0027:\n"
    },
    {
      "commit": "50845c903200fbf5e1e61012376516931e945e4c",
      "tree": "85df096ae36e2226ef9344e1ac419d8ebee8c1b2",
      "parents": [
        "d17ce3f8c06b9dec0f20075043a7806cc0224e1b",
        "e4fe3a4f41f296ac0471152542fcfd904ee50b0e"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Dec 13 19:10:19 2011 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Dec 13 19:10:19 2011 -0800"
      },
      "message": "Reconcile with ics-mr1-release\n\nChange-Id: I27a7b110d3c376fd3b90b29d028b6678507955a8\n"
    },
    {
      "commit": "e4fe3a4f41f296ac0471152542fcfd904ee50b0e",
      "tree": "85df096ae36e2226ef9344e1ac419d8ebee8c1b2",
      "parents": [
        "19e9d0fe6dc3ff4fb1807fee2ad058bf3277e883",
        "5061489994828273312d445e7b52aa5a337e4ea0"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Tue Dec 13 16:03:26 2011 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Tue Dec 13 16:03:26 2011 -0800"
      },
      "message": "merge in ics-mr1-release history after reset to ics-mr1\n"
    },
    {
      "commit": "f4ebe8bdfa7e94d7613a4acfc1fb5f6c747bebd3",
      "tree": "ed289e8d756105114a04b35dbef3c027454f49f7",
      "parents": [
        "6d3deeede48d298f95643a98e0bb8636bfbe906e",
        "d17ce3f8c06b9dec0f20075043a7806cc0224e1b"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Dec 13 12:04:35 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Dec 13 12:04:35 2011 -0800"
      },
      "message": "am 22e50edd: (-s ours) am 3ab63008: Merge \"DO NOT MERGE: Support for parsing of \"folded\" RTSP header values\" into ics-mr1\n\n* commit \u002722e50edddc2a13fa9cc00f7cc5a5f6471cbece24\u0027:\n  DO NOT MERGE: Support for parsing of \"folded\" RTSP header values\n"
    },
    {
      "commit": "d17ce3f8c06b9dec0f20075043a7806cc0224e1b",
      "tree": "85df096ae36e2226ef9344e1ac419d8ebee8c1b2",
      "parents": [
        "df4856c3e34231ba0998814cd1c4d9e33dd929b6",
        "19e9d0fe6dc3ff4fb1807fee2ad058bf3277e883"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Dec 13 12:01:46 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Dec 13 12:01:46 2011 -0800"
      },
      "message": "am 3ab63008: Merge \"DO NOT MERGE: Support for parsing of \"folded\" RTSP header values\" into ics-mr1\n\n* commit \u00273ab630084071eb5dc7f92b4a8a617f8cef10c514\u0027:\n  DO NOT MERGE: Support for parsing of \"folded\" RTSP header values\n"
    },
    {
      "commit": "19e9d0fe6dc3ff4fb1807fee2ad058bf3277e883",
      "tree": "85df096ae36e2226ef9344e1ac419d8ebee8c1b2",
      "parents": [
        "a9d421d3c05b98ee5481428ca3dcb3e3245140ff"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Fri Dec 09 15:09:56 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Tue Dec 13 10:09:48 2011 -0800"
      },
      "message": "DO NOT MERGE: Support for parsing of \"folded\" RTSP header values\n\nand some tweaks to the AMR assembler contributed by Samsung (untested).\n\nChange-Id: I6c3df31fa3a35433bfddfdda82747bb4c6ee86a1\nrelated-to-bug: 5669027\n"
    },
    {
      "commit": "6d3deeede48d298f95643a98e0bb8636bfbe906e",
      "tree": "ed289e8d756105114a04b35dbef3c027454f49f7",
      "parents": [
        "25b1e93b052ed3590c1ee4d03476c242187de36b",
        "df4856c3e34231ba0998814cd1c4d9e33dd929b6"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Dec 13 05:40:57 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Dec 13 05:40:57 2011 -0800"
      },
      "message": "am da296533: Reconcile with ics-mr1-release\n\n* commit \u0027da29653305f299d6390492333a6360cfa78665d9\u0027:\n"
    },
    {
      "commit": "df4856c3e34231ba0998814cd1c4d9e33dd929b6",
      "tree": "9923d2dba8b8bf93adb3e4a54aa8788031f6c75b",
      "parents": [
        "956a9787cfaf429f951549df6e587c6ce4ac20f8",
        "5061489994828273312d445e7b52aa5a337e4ea0"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Dec 13 05:11:43 2011 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Tue Dec 13 05:11:43 2011 -0800"
      },
      "message": "Reconcile with ics-mr1-release\n\nChange-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8\n"
    },
    {
      "commit": "5061489994828273312d445e7b52aa5a337e4ea0",
      "tree": "9923d2dba8b8bf93adb3e4a54aa8788031f6c75b",
      "parents": [
        "a9d421d3c05b98ee5481428ca3dcb3e3245140ff",
        "7e2afc451825028bdeb43e60450a730a4290dfd8"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Mon Dec 12 22:08:59 2011 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Mon Dec 12 22:08:59 2011 -0800"
      },
      "message": "merge in ics-mr1-release history after reset to ics-mr1\n"
    },
    {
      "commit": "25b1e93b052ed3590c1ee4d03476c242187de36b",
      "tree": "ed289e8d756105114a04b35dbef3c027454f49f7",
      "parents": [
        "50a44951baf856cda679e78947e369ce923a6517",
        "956a9787cfaf429f951549df6e587c6ce4ac20f8"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Mon Dec 12 15:39:19 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Dec 12 15:39:19 2011 -0800"
      },
      "message": "am 40375099: Reconcile with ics-mr1-release\n\n* commit \u002740375099d10139b6c96c1db8b8295874d60c712e\u0027:\n"
    },
    {
      "commit": "50a44951baf856cda679e78947e369ce923a6517",
      "tree": "ed289e8d756105114a04b35dbef3c027454f49f7",
      "parents": [
        "fec2284d520fa2856358692095a715678225abcb",
        "2a82a3a8824904f4e6750eb18dcc33ed113edbeb"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Mon Dec 12 15:39:17 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Dec 12 15:39:17 2011 -0800"
      },
      "message": "am f14dc291: Merge from ics-mr1\n\n* commit \u0027f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1\u0027:\n  Fix drm enumeration order, resolves failure to play forward lock ringtones\n"
    },
    {
      "commit": "fec2284d520fa2856358692095a715678225abcb",
      "tree": "1218ef21e382416724a8d29a820b9680ac57030f",
      "parents": [
        "d1b9f44fccd387abbc42b6923b2b06ac7db1aa05",
        "736d8141e8f060c79c297c5447cdbe2c7fa9e231"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Mon Dec 12 15:30:16 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Dec 12 15:30:16 2011 -0800"
      },
      "message": "am dc44e06e: am ef664f62: Merge \"Fix drm flag setting missed in false drm recognition fix.\" into ics-mr1\n\n* commit \u0027dc44e06ef305be8de060af69a468e003e231ba05\u0027:\n  Fix drm flag setting missed in false drm recognition fix.\n"
    },
    {
      "commit": "d1b9f44fccd387abbc42b6923b2b06ac7db1aa05",
      "tree": "f350407696abae23439b73ed717c113007fdeb90",
      "parents": [
        "f2d86c8afe5e80bc178c1758d41b7bf154960318",
        "254868809d7df841112209fcbf5c191cce013f81"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Mon Dec 12 15:29:56 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Dec 12 15:29:56 2011 -0800"
      },
      "message": "am 175d5d76: Reconcile with ics-mr1-release\n\n* commit \u0027175d5d76b0aa9808b4214522a6fdf461109560ec\u0027:\n"
    },
    {
      "commit": "f2d86c8afe5e80bc178c1758d41b7bf154960318",
      "tree": "f350407696abae23439b73ed717c113007fdeb90",
      "parents": [
        "6af1e76b61d04ed524b570f92091680a851207df",
        "1da7ad123ccee937a52b833d80ea8ddf462ad9a3"
      ],
      "author": {
        "name": "James Dong",
        "email": "jdong@google.com",
        "time": "Mon Dec 12 15:29:46 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Dec 12 15:29:46 2011 -0800"
      },
      "message": "am 406dd5d1: am aadbd80b: Fixed the false drm recognition.\n\n* commit \u0027406dd5d1e48752177753666867403542e1f400ca\u0027:\n  Fixed the false drm recognition.\n"
    },
    {
      "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": "6af1e76b61d04ed524b570f92091680a851207df",
      "tree": "ebd691ae57ff1efff4011a367e29e520ac2cb8c3",
      "parents": [
        "d2927a79dc933a134e022281a4679a65e340dc3a",
        "4aae77cbe1bf4369910314a55c2bc2349af10d3c"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Mon Dec 12 08:32:28 2011 -0800"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Dec 12 08:32:28 2011 -0800"
      },
      "message": "Merge \"Support for parsing of \"folded\" RTSP header values and some tweaks to the AMR assembler\""
    },
    {
      "commit": "956a9787cfaf429f951549df6e587c6ce4ac20f8",
      "tree": "9923d2dba8b8bf93adb3e4a54aa8788031f6c75b",
      "parents": [
        "2a82a3a8824904f4e6750eb18dcc33ed113edbeb",
        "7e2afc451825028bdeb43e60450a730a4290dfd8"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Mon Dec 12 07:59:17 2011 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Mon Dec 12 07:59:17 2011 -0800"
      },
      "message": "Reconcile with ics-mr1-release\n\nChange-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3\n"
    },
    {
      "commit": "2a82a3a8824904f4e6750eb18dcc33ed113edbeb",
      "tree": "9923d2dba8b8bf93adb3e4a54aa8788031f6c75b",
      "parents": [
        "736d8141e8f060c79c297c5447cdbe2c7fa9e231",
        "a9d421d3c05b98ee5481428ca3dcb3e3245140ff"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Mon Dec 12 07:47:34 2011 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Mon Dec 12 07:47:43 2011 -0800"
      },
      "message": "Merge from ics-mr1\n\nChange-Id: I209499775ddf68b380d0ec801d558e1dc86ab953\n"
    },
    {
      "commit": "d2927a79dc933a134e022281a4679a65e340dc3a",
      "tree": "df37d4c9284b27328073c30d7543977c8c9bf103",
      "parents": [
        "a3e52a846f1e299c4b205e2da698b184591d618e"
      ],
      "author": {
        "name": "Owen Lin",
        "email": "owenlin@google.com",
        "time": "Mon Dec 12 16:17:34 2011 +0800"
      },
      "committer": {
        "name": "Owen Lin",
        "email": "owenlin@google.com",
        "time": "Mon Dec 12 16:17:34 2011 +0800"
      },
      "message": "Fix the build. (Change LOGV to ALOGV)\n\nChange-Id: I14104540cfbd2bcdd7af1534db20554b88c4c0ce\n"
    },
    {
      "commit": "a9d421d3c05b98ee5481428ca3dcb3e3245140ff",
      "tree": "9923d2dba8b8bf93adb3e4a54aa8788031f6c75b",
      "parents": [
        "7e976e926dd8085a64a7add97ce09bfeca26e088"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Dec 09 20:04:17 2011 -0800"
      },
      "committer": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Dec 09 20:04:17 2011 -0800"
      },
      "message": "Fix drm enumeration order, resolves failure to play forward lock ringtones\n\nChange-Id: I58e8a26849409bc3bf98b066c5e07c2a0c91e0c9\nrelated-to-bug: 5735466\n"
    },
    {
      "commit": "a3e52a846f1e299c4b205e2da698b184591d618e",
      "tree": "27447717d1d66b4c8fe20391c3805c13885463ee",
      "parents": [
        "aa5ba9a27f4c483ee116b7b296a681f4f8e23e62",
        "3b42170d4ceaef29daf6fef51c06dd3d88d99a67"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Fri Dec 09 18:09:21 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Dec 09 18:09:21 2011 -0800"
      },
      "message": "am ebfce84f: am 68f592a8: Merge \"Don\\\u0027t perform RTSP seeks right away but queue them for 200ms\" into ics-mr1\n\n* commit \u0027ebfce84f7fd3e25fa08c36b155db91df90a59b3d\u0027:\n  Don\u0027t perform RTSP seeks right away but queue them for 200ms\n"
    },
    {
      "commit": "aa5ba9a27f4c483ee116b7b296a681f4f8e23e62",
      "tree": "272b4fa8657fe153eed988e69d5253dd7e0015f7",
      "parents": [
        "e154d13b47d7a2bf5968a7c6070da15814d3c544",
        "62c54ce5b09bab16dfabf18cc1f2dc1d9b35acf8"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Fri Dec 09 18:09:19 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Dec 09 18:09:19 2011 -0800"
      },
      "message": "am aa82c39b: am 0ba9380a: Merge \"Fix Bitreader \"putBits\" implementation, make sure we emulate timestamps\" into ics-mr1\n\n* commit \u0027aa82c39bdb4ad9c1fdcb09f3bea11be5197d3ce6\u0027:\n  Fix Bitreader \"putBits\" implementation, make sure we emulate timestamps\n"
    },
    {
      "commit": "7e2afc451825028bdeb43e60450a730a4290dfd8",
      "tree": "dd64d410e936b9d0a31ca606598ae34153faca4d",
      "parents": [
        "7e976e926dd8085a64a7add97ce09bfeca26e088",
        "0de434f36f7610e6652604f4b7ca7c778757eeac"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Fri Dec 09 16:17:04 2011 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Fri Dec 09 16:17:04 2011 -0800"
      },
      "message": "merge in ics-mr1-release history after reset to ics-mr1\n"
    },
    {
      "commit": "4aae77cbe1bf4369910314a55c2bc2349af10d3c",
      "tree": "befe62758daa28bdef02b1e687a38f545c862eaf",
      "parents": [
        "eebeceec684a36222b4559e3157b0db04c0a67ed"
      ],
      "author": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Fri Dec 09 15:09:56 2011 -0800"
      },
      "committer": {
        "name": "Andreas Huber",
        "email": "andih@google.com",
        "time": "Fri Dec 09 15:09:56 2011 -0800"
      },
      "message": "Support for parsing of \"folded\" RTSP header values and some tweaks to the AMR assembler\n\ncontributed by Samsung (untested).\n\nChange-Id: I182561fe0a1a564126bdbb317e96aa52bf525726\n"
    }
  ],
  "next": "e154d13b47d7a2bf5968a7c6070da15814d3c544"
}