)]}'
{
  "log": [
    {
      "commit": "5b823b4cca17de5249fbbd774541c69b970e8da8",
      "tree": "38979a1e02f6535d581021d43b5ae0ad092e16b3",
      "parents": [
        "391906630443d7bd1d3a34e34535d93113723316",
        "c6a8eec53535fcb074989b5966baec48628a6f94"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Feb 24 10:26:53 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Feb 24 10:26:53 2012 -0800"
      },
      "message": "am d6a25154: Merge \"stagefright aacenc: Fix an inline asm constraint\"\n\n* commit \u0027d6a25154d94c48ab2ef12641c789458ab14ca94f\u0027:\n  stagefright aacenc: Fix an inline asm constraint\n"
    },
    {
      "commit": "391906630443d7bd1d3a34e34535d93113723316",
      "tree": "0905eb16e4e404e920386cdbee4e78359782a705",
      "parents": [
        "90b8ca7c29d75a265faaa9386d556d41ca5be538",
        "de8b924a7f7d104af4243b1dfaef6f4480f93eea"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Feb 24 10:24:34 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Feb 24 10:24:34 2012 -0800"
      },
      "message": "am ea227787: Merge changes I903353c5,I822dcc74\n\n* commit \u0027ea227787253e29da2d688399b097e05708d3bf73\u0027:\n  stagefright amrnb: Properly negate all values\n  stagefright amrnb: Fix a bug on architectures where long is 64 bit\n"
    },
    {
      "commit": "c6a8eec53535fcb074989b5966baec48628a6f94",
      "tree": "f675c789bf139e5b528cf43879edd225a2164145",
      "parents": [
        "de8b924a7f7d104af4243b1dfaef6f4480f93eea",
        "721f2bb7b28891c0811a5bea31fa62644131befc"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Feb 24 10:22:33 2012 -0800"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Fri Feb 24 10:22:34 2012 -0800"
      },
      "message": "Merge \"stagefright aacenc: Fix an inline asm constraint\""
    },
    {
      "commit": "de8b924a7f7d104af4243b1dfaef6f4480f93eea",
      "tree": "9b84579b7355e767287ceb9fb1e0008041a83606",
      "parents": [
        "80d4b8903ed09d2cf9ac35391f04eb8619f47a1e",
        "e55147f462e04d41bff7ead6e9ea61a5b83bda4b"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Feb 24 10:07:47 2012 -0800"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Fri Feb 24 10:07:49 2012 -0800"
      },
      "message": "Merge changes I903353c5,I822dcc74\n\n* changes:\n  stagefright amrnb: Properly negate all values\n  stagefright amrnb: Fix a bug on architectures where long is 64 bit\n"
    },
    {
      "commit": "90b8ca7c29d75a265faaa9386d556d41ca5be538",
      "tree": "bf1342cf15fce4b282a82ed802d561e808623a4d",
      "parents": [
        "142ce9a65b7505819e1205ad5bfa5d63843c7f43",
        "80d4b8903ed09d2cf9ac35391f04eb8619f47a1e"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Feb 24 09:54:58 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Feb 24 09:54:58 2012 -0800"
      },
      "message": "am bf45bbf3: Merge \"stagefright aacenc: Zero-initialize a struct\"\n\n* commit \u0027bf45bbf3b4a54976b81234ffc8ac41520bc052fc\u0027:\n  stagefright aacenc: Zero-initialize a struct\n"
    },
    {
      "commit": "80d4b8903ed09d2cf9ac35391f04eb8619f47a1e",
      "tree": "df8ea43f1e9dc3588cb9a20b44e8bb531ffd1634",
      "parents": [
        "ccdf9e6e3dc929a9ffee7ed2aab57115ef810527",
        "132e42c04a58e623efa6cd6ca43641cd80db0f05"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Feb 24 09:47:22 2012 -0800"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Fri Feb 24 09:47:23 2012 -0800"
      },
      "message": "Merge \"stagefright aacenc: Zero-initialize a struct\""
    },
    {
      "commit": "142ce9a65b7505819e1205ad5bfa5d63843c7f43",
      "tree": "88f72f0a473bdedcb2512f579149f309ccdbb80e",
      "parents": [
        "9884ee5920da4976a4de809567ad8fcbe8608433",
        "ccdf9e6e3dc929a9ffee7ed2aab57115ef810527"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Feb 24 09:45:40 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Feb 24 09:45:40 2012 -0800"
      },
      "message": "am e5bdd24b: Merge \"stagefright aacenc: Avoid warnings about incompatible pointer types\"\n\n* commit \u0027e5bdd24b69c4033163d478d721247691e11cea36\u0027:\n  stagefright aacenc: Avoid warnings about incompatible pointer types\n"
    },
    {
      "commit": "9884ee5920da4976a4de809567ad8fcbe8608433",
      "tree": "70869a66e5e283a5fd46cd1b8279c0add7d7a728",
      "parents": [
        "db7670ab7a884efb64f0e7a20425b6445d749822",
        "aa1639aeb42e7c403315319bf55632de93d3c8d9"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Feb 24 09:20:44 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Feb 24 09:20:44 2012 -0800"
      },
      "message": "am 47b56c5a: Merge \"stagefright aacenc: Add const declarations to some pointers\"\n\n* commit \u002747b56c5a46287ea226c05e3c0238a91f4702491a\u0027:\n  stagefright aacenc: Add const declarations to some pointers\n"
    },
    {
      "commit": "ccdf9e6e3dc929a9ffee7ed2aab57115ef810527",
      "tree": "76031c8576797b93322bfb46e5022ab0c5cffc88",
      "parents": [
        "aa1639aeb42e7c403315319bf55632de93d3c8d9",
        "cf8b805a0c0695097211ca18237c27f45b0df85c"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Feb 24 09:20:36 2012 -0800"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Fri Feb 24 09:20:37 2012 -0800"
      },
      "message": "Merge \"stagefright aacenc: Avoid warnings about incompatible pointer types\""
    },
    {
      "commit": "aa1639aeb42e7c403315319bf55632de93d3c8d9",
      "tree": "65487d4fe9a8aad6fcdc3c4322fcdc7048b62e38",
      "parents": [
        "3e4d4efcaf00c8263c7bcd651e453e93b60535da",
        "9fc4dfb69df0b5a13b7a1904272eb1dcf8113d0c"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Feb 24 08:53:24 2012 -0800"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Fri Feb 24 08:53:25 2012 -0800"
      },
      "message": "Merge \"stagefright aacenc: Add const declarations to some pointers\""
    },
    {
      "commit": "db7670ab7a884efb64f0e7a20425b6445d749822",
      "tree": "b4009a76bf26daf8380cbebc1966cc39617ecf37",
      "parents": [
        "7ce8b8c79c866fd787f3b4628abf5028207312e6",
        "3e4d4efcaf00c8263c7bcd651e453e93b60535da"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Feb 24 08:50:32 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Feb 24 08:50:32 2012 -0800"
      },
      "message": "am 1b704610: Merge \"stagefright aacenc: Fix inline asm\"\n\n* commit \u00271b7046108c0f381fa8b7efaebae02c1a2b3099b3\u0027:\n  stagefright aacenc: Fix inline asm\n"
    },
    {
      "commit": "3e4d4efcaf00c8263c7bcd651e453e93b60535da",
      "tree": "b689355ac28b6185f4203bd64cd762d3829e0ff1",
      "parents": [
        "6dfeab4ddf3fcb82483f29d146329aa959fc0c82",
        "9da751147af3222258093d9f41cabf0ea1391c04"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Feb 24 08:38:22 2012 -0800"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Fri Feb 24 08:38:23 2012 -0800"
      },
      "message": "Merge \"stagefright aacenc: Fix inline asm\""
    },
    {
      "commit": "7ce8b8c79c866fd787f3b4628abf5028207312e6",
      "tree": "fa55f8db0ff1e9ec0f9974e6055aa7dda0b9ae4c",
      "parents": [
        "c58295bfa07615b81b9bf5784cb8e2dac79aded7",
        "6dfeab4ddf3fcb82483f29d146329aa959fc0c82"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Feb 24 07:53:43 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Feb 24 07:53:43 2012 -0800"
      },
      "message": "am bf1e85bf: Merge \"stagefright aacenc: Fix inline asm constraints\"\n\n* commit \u0027bf1e85bfc8293646d57f0017afbfb0e09a1a41d7\u0027:\n  stagefright aacenc: Fix inline asm constraints\n"
    },
    {
      "commit": "6dfeab4ddf3fcb82483f29d146329aa959fc0c82",
      "tree": "6b31e1bcadc9d8ea7329aca8d702f5c4d41e3d6f",
      "parents": [
        "013b73bfc4d5fb21082ccccf45fa08c18f86aa08",
        "d2fdc7129d96391d22065866c612d532dfe411b3"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Feb 24 07:39:02 2012 -0800"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Fri Feb 24 07:39:03 2012 -0800"
      },
      "message": "Merge \"stagefright aacenc: Fix inline asm constraints\""
    },
    {
      "commit": "c58295bfa07615b81b9bf5784cb8e2dac79aded7",
      "tree": "cd67a6f089b6dbe9ca033dac2454ba56ad69e62f",
      "parents": [
        "11484788dd0c2ec9fce29c523a7748de34fb9b8a",
        "cdb22f7bbe6a6456e572e06c7e579578d2075ccc"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Mon Jan 30 13:36:34 2012 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Mon Jan 30 13:36:34 2012 -0800"
      },
      "message": "Reconcile with ics-mr1-release\n\nChange-Id: Ic6454a4b7929bbf2f453022fd8ae596e215657c2\n"
    },
    {
      "commit": "cf8b805a0c0695097211ca18237c27f45b0df85c",
      "tree": "1c3fa4d9b32c35e7adf6420a201c70061fa94b61",
      "parents": [
        "013b73bfc4d5fb21082ccccf45fa08c18f86aa08"
      ],
      "author": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Wed Dec 22 22:33:03 2010 +0100"
      },
      "committer": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Mon Jan 30 12:59:03 2012 +0200"
      },
      "message": "stagefright aacenc: Avoid warnings about incompatible pointer types\n\nChange-Id: Ida53cd1030ebb9feb0d6916e42e8ba67a90e86c7\n"
    },
    {
      "commit": "11484788dd0c2ec9fce29c523a7748de34fb9b8a",
      "tree": "cd67a6f089b6dbe9ca033dac2454ba56ad69e62f",
      "parents": [
        "bfd99cb8261a8a1ae65dc2e956b5fce8484713bb",
        "395584e473cc096c84d6657d07380d65dd711e14"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Jan 25 10:30:31 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 25 10:30:31 2012 -0800"
      },
      "message": "am 64085d03: am 12045502: Merge \"stagefright aacenc: Fix type definitions for 64 bit platforms\"\n\n* commit \u002764085d03efcd2abf3b8cd64f4e6344a1ece014c3\u0027:\n  stagefright aacenc: Fix type definitions for 64 bit platforms\n"
    },
    {
      "commit": "395584e473cc096c84d6657d07380d65dd711e14",
      "tree": "8f9fbe49ae5228b83f80239e8dcb8d773b78175b",
      "parents": [
        "fa521a76c4fc14b01b46930cd0d04856d57fdcc1",
        "013b73bfc4d5fb21082ccccf45fa08c18f86aa08"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Jan 25 10:27:41 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 25 10:27:41 2012 -0800"
      },
      "message": "am 12045502: Merge \"stagefright aacenc: Fix type definitions for 64 bit platforms\"\n\n* commit \u002712045502c49bfee40d7d3cb806d9b70d3b5d3ed3\u0027:\n  stagefright aacenc: Fix type definitions for 64 bit platforms\n"
    },
    {
      "commit": "013b73bfc4d5fb21082ccccf45fa08c18f86aa08",
      "tree": "d1f5ef6a098384c3ce2ed502c9b0e8db8572bf1d",
      "parents": [
        "ceec4ae3ba8c3c3d5e243647ad7ee2fc39c71c9c",
        "2db3b238966f5f326010321b698fa938d65b8e8a"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Wed Jan 25 09:17:45 2012 -0800"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Jan 25 09:17:46 2012 -0800"
      },
      "message": "Merge \"stagefright aacenc: Fix type definitions for 64 bit platforms\""
    },
    {
      "commit": "bfd99cb8261a8a1ae65dc2e956b5fce8484713bb",
      "tree": "223eee889957f99ec648360f20acb678bb752702",
      "parents": [
        "f27286d86de720e2b0af9f4facf671f3a5de1d85",
        "fa521a76c4fc14b01b46930cd0d04856d57fdcc1"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Tue Jan 24 15:15:36 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 24 15:15:36 2012 -0800"
      },
      "message": "am 4cd2b343: am 98539a4e: Merge \"stagefright amrwbenc: Make the mem_malloc function 64-bit safe\"\n\n* commit \u00274cd2b343272429adae1fc68e0ec0628c69e88e6d\u0027:\n  stagefright amrwbenc: Make the mem_malloc function 64-bit safe\n"
    },
    {
      "commit": "f27286d86de720e2b0af9f4facf671f3a5de1d85",
      "tree": "e477d0f0dfa4f756a4b71d883364ff566ab5a294",
      "parents": [
        "84e19873fde204d73628ba1b5ca9e3f5778574fa",
        "a70de78001281b44e8a05da60d81b551850c57bf"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Tue Jan 24 15:15:33 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 24 15:15:33 2012 -0800"
      },
      "message": "am fc2ea24b: am d80cbb8c: Merge \"stagefright aacenc: Add missing newlines at the end of files\"\n\n* commit \u0027fc2ea24b024f7a015d67054adb7bb09ff3a0a97b\u0027:\n  stagefright aacenc: Add missing newlines at the end of files\n"
    },
    {
      "commit": "fa521a76c4fc14b01b46930cd0d04856d57fdcc1",
      "tree": "6739824d3eb9aff3fe2b538e41ef458a721cd83f",
      "parents": [
        "a70de78001281b44e8a05da60d81b551850c57bf",
        "ceec4ae3ba8c3c3d5e243647ad7ee2fc39c71c9c"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Tue Jan 24 15:13:45 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 24 15:13:45 2012 -0800"
      },
      "message": "am 98539a4e: Merge \"stagefright amrwbenc: Make the mem_malloc function 64-bit safe\"\n\n* commit \u002798539a4eba7677c0b1ddc12f800c7075851ef302\u0027:\n  stagefright amrwbenc: Make the mem_malloc function 64-bit safe\n"
    },
    {
      "commit": "a70de78001281b44e8a05da60d81b551850c57bf",
      "tree": "cb830065e0f7aee4a0489413ffc8197e385c871d",
      "parents": [
        "5e37bc8d9ba68d6bc42e70a263f7c2969cc3c787",
        "a078e9b727156c76ef864ac2d8b3f6a99df9e604"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Tue Jan 24 15:13:42 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 24 15:13:42 2012 -0800"
      },
      "message": "am d80cbb8c: Merge \"stagefright aacenc: Add missing newlines at the end of files\"\n\n* commit \u0027d80cbb8c7b13203704c00e2f5941588811c15665\u0027:\n  stagefright aacenc: Add missing newlines at the end of files\n"
    },
    {
      "commit": "ceec4ae3ba8c3c3d5e243647ad7ee2fc39c71c9c",
      "tree": "0ab7debc48c0bed46932a39cd506edb4320bdd6d",
      "parents": [
        "a078e9b727156c76ef864ac2d8b3f6a99df9e604",
        "417f62c84261ea17e17a011b1e9706eb997a6ba1"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Tue Jan 24 14:26:30 2012 -0800"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue Jan 24 14:26:32 2012 -0800"
      },
      "message": "Merge \"stagefright amrwbenc: Make the mem_malloc function 64-bit safe\""
    },
    {
      "commit": "cdb22f7bbe6a6456e572e06c7e579578d2075ccc",
      "tree": "ff39d6e267fb9ebaa473db578ef3525330d8450d",
      "parents": [
        "21e4b6ed00e814bffc70895847a4944d7a190020",
        "6813a4d34b2f4b866438c9bcbcd93b0184a43a36"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Tue Jan 24 13:33:01 2012 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Tue Jan 24 13:33:01 2012 -0800"
      },
      "message": "merge in ics-mr1-release history after reset to ics-mr1\n"
    },
    {
      "commit": "84e19873fde204d73628ba1b5ca9e3f5778574fa",
      "tree": "113fb74556ff48132400e936fa7bd77233630429",
      "parents": [
        "7c5aea0a8d9b422999483f96a2566f77ff11abf2",
        "21e4b6ed00e814bffc70895847a4944d7a190020"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Jan 24 11:51:50 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 24 11:51:50 2012 -0800"
      },
      "message": "am 7eeaf3f0: Merge \"AudioFlinger: refine mixer sleep time logic\" into ics-mr1\n\n* commit \u00277eeaf3f07aa6fb10639d9f96c1367eb98c3e8839\u0027:\n  AudioFlinger: refine mixer sleep time logic\n"
    },
    {
      "commit": "7c5aea0a8d9b422999483f96a2566f77ff11abf2",
      "tree": "be8c3dc3c8d2a781020eba7fb165c440f81ff38c",
      "parents": [
        "d9f088521782f071fc615df0ebbc80e53e21b2b1",
        "eaa0b5cc2f7723e9b25298126d0dcb48c56d5dac"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Jan 24 11:51:47 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 24 11:51:47 2012 -0800"
      },
      "message": "am 41773d46: Merge \"DO NOT MERGE Revert \"Revert \"AudioFlinger: mix track only when really ready (2)\"\"\" into ics-mr1\n\n* commit \u002741773d46556aa47d4322ff89fdaf7d1345c2d1f2\u0027:\n  DO NOT MERGE Revert \"Revert \"AudioFlinger: mix track only when really ready (2)\"\"\n"
    },
    {
      "commit": "a078e9b727156c76ef864ac2d8b3f6a99df9e604",
      "tree": "d8d3c75ca7ff1b3720686ab160ef2a8f23dfb289",
      "parents": [
        "9c7ebfd56cef49f9a26572b44790868689599e34",
        "891abc0ee089f2ba5b92dcc014e5efc2ef07f01e"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Tue Jan 24 10:34:24 2012 -0800"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue Jan 24 10:34:25 2012 -0800"
      },
      "message": "Merge \"stagefright aacenc: Add missing newlines at the end of files\""
    },
    {
      "commit": "d9f088521782f071fc615df0ebbc80e53e21b2b1",
      "tree": "b2a92dd5fb2a92f031ada872312920be724fdf56",
      "parents": [
        "15dfda272eec983508b89fb8bc9ca6f2bb825496",
        "5e37bc8d9ba68d6bc42e70a263f7c2969cc3c787"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Tue Jan 24 08:43:14 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 24 08:43:14 2012 -0800"
      },
      "message": "am 2ae5805c: am 164a9842: Merge \"stagefright aacenc: Properly terminate a comment\"\n\n* commit \u00272ae5805cf18ad6bdbea5def03a488e14c1a8804c\u0027:\n  stagefright aacenc: Properly terminate a comment\n"
    },
    {
      "commit": "5e37bc8d9ba68d6bc42e70a263f7c2969cc3c787",
      "tree": "be8c3dc3c8d2a781020eba7fb165c440f81ff38c",
      "parents": [
        "a3db30f7c53936a3acb87d2c44807ee2f0cfa16e",
        "9c7ebfd56cef49f9a26572b44790868689599e34"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Tue Jan 24 08:40:50 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 24 08:40:50 2012 -0800"
      },
      "message": "am 164a9842: Merge \"stagefright aacenc: Properly terminate a comment\"\n\n* commit \u0027164a984224f5d430757628028f2522329987350f\u0027:\n  stagefright aacenc: Properly terminate a comment\n"
    },
    {
      "commit": "9c7ebfd56cef49f9a26572b44790868689599e34",
      "tree": "934f0a94824dd4f5888569302f9b8f63cf1ee644",
      "parents": [
        "39fd8eb956dea32692d3d72b10b64a8597df0a40",
        "60866592ed6953f2b0e12cefcd58f1ced26546d0"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Tue Jan 24 07:51:11 2012 -0800"
      },
      "committer": {
        "name": "android code review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue Jan 24 07:51:12 2012 -0800"
      },
      "message": "Merge \"stagefright aacenc: Properly terminate a comment\""
    },
    {
      "commit": "21e4b6ed00e814bffc70895847a4944d7a190020",
      "tree": "ff39d6e267fb9ebaa473db578ef3525330d8450d",
      "parents": [
        "eaa0b5cc2f7723e9b25298126d0dcb48c56d5dac"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon Jan 23 18:56:59 2012 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon Jan 23 18:56:59 2012 -0800"
      },
      "message": "AudioFlinger: refine mixer sleep time logic\n\nWhen an AudioTrack is in underrun state, the AudioFlinger mixer will\nsleep for a short period of time to give the app a chance to fill the\nAudioTrack buffer. If the AudioTrack is still not ready during next mixing round,\nthe mixer will proceed with other tracks.\n\nIf an application keeps a steady underrun condition, the AudioFlinger mixer will\nalternate between ready and not ready states. In the longer term this will cause the\naudio HAL to underrun.\nThere is a mechanism to reduce the sleep period if the mixer is not ready several times in a\nrow but this mechanism is defeated by the alternating ready/not ready conditions.\n\nThe fix consists in only increasing sleep time if the mixer is ready for at least two\nconsecutive times.\n\nIssue 5904527.\n\nChange-Id: Id0139bca9be8c4e425ec6d428515c4d8f718e8c9\n"
    },
    {
      "commit": "eaa0b5cc2f7723e9b25298126d0dcb48c56d5dac",
      "tree": "5c73ae7daf8480e7ce2cc862790332401688931b",
      "parents": [
        "7baf7894bc2f1a62440f381eeb50143f210a5d61"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon Jan 23 18:35:10 2012 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon Jan 23 18:37:07 2012 -0800"
      },
      "message": "DO NOT MERGE Revert \"Revert \"AudioFlinger: mix track only when really ready (2)\"\"\n\nThis reverts commit b918035d34422a2041b6ec8c09c566bb93345b40.\n\nChange-Id: I093bcfa56ad54a080b930208b6b79169d33581fb\n"
    },
    {
      "commit": "6813a4d34b2f4b866438c9bcbcd93b0184a43a36",
      "tree": "0ddf435e065f725aebbd1a726eb1087f6e5decfb",
      "parents": [
        "e4b8fa11add55107ec74d7df7c4fe6b57a7f301e"
      ],
      "author": {
        "name": "Justin Ho",
        "email": "justinho@google.com",
        "time": "Mon Jan 23 14:01:15 2012 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Mon Jan 23 16:55:47 2012 -0800"
      },
      "message": "DO NOT MERGE Revert \"AudioFlinger: mix track only when really ready (2)\"\n\nThis reverts commit 71c4496a9757438afd30b4404824f296f6158a49.\n\nChange-Id: Iff10c49ea728bb10023ddeb50a3b708db770fff2\n"
    },
    {
      "commit": "15dfda272eec983508b89fb8bc9ca6f2bb825496",
      "tree": "0c98903df597cd0d08e6a40b1c11b78cde2d6cbd",
      "parents": [
        "a3db30f7c53936a3acb87d2c44807ee2f0cfa16e",
        "7baf7894bc2f1a62440f381eeb50143f210a5d61"
      ],
      "author": {
        "name": "Justin Ho",
        "email": "justinho@google.com",
        "time": "Mon Jan 23 15:13:19 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Jan 23 15:13:19 2012 -0800"
      },
      "message": "am fee5a860: Merge \"DO NOT MERGE Revert \"AudioFlinger: mix track only when really ready (2)\"\" into ics-mr1\n\n* commit \u0027fee5a860a8355cda071ff23644e943414ba7f65d\u0027:\n  DO NOT MERGE Revert \"AudioFlinger: mix track only when really ready (2)\"\n"
    },
    {
      "commit": "7baf7894bc2f1a62440f381eeb50143f210a5d61",
      "tree": "0ddf435e065f725aebbd1a726eb1087f6e5decfb",
      "parents": [
        "2774144fa8283f1a7b43e17a53c97dec0c366dd3"
      ],
      "author": {
        "name": "Justin Ho",
        "email": "justinho@google.com",
        "time": "Mon Jan 23 14:01:15 2012 -0800"
      },
      "committer": {
        "name": "Justin Ho",
        "email": "justinho@google.com",
        "time": "Mon Jan 23 15:02:41 2012 -0800"
      },
      "message": "DO NOT MERGE Revert \"AudioFlinger: mix track only when really ready (2)\"\n\nThis reverts commit 71c4496a9757438afd30b4404824f296f6158a49.\n\nChange-Id: Iff10c49ea728bb10023ddeb50a3b708db770fff2\n"
    },
    {
      "commit": "a3db30f7c53936a3acb87d2c44807ee2f0cfa16e",
      "tree": "195b8ec38f5b1e95a375d4a49503a3d923780f69",
      "parents": [
        "d746737921074e2a6c39c52b06022c5166689df5",
        "39fd8eb956dea32692d3d72b10b64a8597df0a40"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Thu Jan 19 17:26:16 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Jan 19 17:26:16 2012 -0800"
      },
      "message": "am 9d25b82d: Merge \"Rename LOG_ASSERT to ALOG_ASSERT\"\n\n* commit \u00279d25b82d280c2d979d500e7da4447148f32f820b\u0027:\n  Rename LOG_ASSERT to ALOG_ASSERT\n"
    },
    {
      "commit": "d746737921074e2a6c39c52b06022c5166689df5",
      "tree": "62cfd5c53cafbf8a2a9f5d3f5095aa68a59eadf2",
      "parents": [
        "daef36f5d4934bd055c694a8d54b86e2b50a6159",
        "9a8ded7348c5b2302dd27b285b395416bc842c49"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Thu Jan 19 17:26:12 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Jan 19 17:26:12 2012 -0800"
      },
      "message": "am 6df477be: Merge \"Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)\"\n\n* commit \u00276df477be186233e36fc370c4d2db6c1ed928a740\u0027:\n  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)\n"
    },
    {
      "commit": "daef36f5d4934bd055c694a8d54b86e2b50a6159",
      "tree": "b9b371d7ce18951afafc597c2bc3fb01e9b63768",
      "parents": [
        "3734cbca25c6d902677cfb5e59dff7a1cb17a45d",
        "aa70226152d2084f85a96b52359dbc8476a86a45"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Thu Jan 19 17:26:08 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Jan 19 17:26:08 2012 -0800"
      },
      "message": "am a826f9e2: Merge \"Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)\"\n\n* commit \u0027a826f9e2c4f6329d8d48c927f6e942e78ffaf92f\u0027:\n  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)\n"
    },
    {
      "commit": "3734cbca25c6d902677cfb5e59dff7a1cb17a45d",
      "tree": "b7dda06a4111a2c7da34d41949cf288ad535a768",
      "parents": [
        "e744a90eb52bf9547848c08380cfb7ba7e63ffbc",
        "53feeb42c721e8fc9285e35e679906a951f3277c"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Thu Jan 19 17:26:03 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Jan 19 17:26:03 2012 -0800"
      },
      "message": "am 4f367f33: Merge \"Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)\"\n\n* commit \u00274f367f3387887c538c81c34cc8becaea6fa5e430\u0027:\n  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)\n"
    },
    {
      "commit": "e744a90eb52bf9547848c08380cfb7ba7e63ffbc",
      "tree": "6154d54c66881857e2bd851a59273e15b6adb769",
      "parents": [
        "ca05a87f4c69670a06bdee4b4f98bcdcd838beda",
        "52546c0ef96aa3e7e21482e0f9b6e982557c8da9"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Thu Jan 19 17:25:58 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Jan 19 17:25:58 2012 -0800"
      },
      "message": "am ba7f0d2a: Merge \"Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)\"\n\n* commit \u0027ba7f0d2a03643ce429421b81febf18fd50473070\u0027:\n  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)\n"
    },
    {
      "commit": "ca05a87f4c69670a06bdee4b4f98bcdcd838beda",
      "tree": "2b8556647f7fa9b8fd3c9355cda3bb26779bf725",
      "parents": [
        "90a607163f793b968d96295b876532e4d03b642c",
        "3812256de32e73e38ba16e50ac0451c10223d4eb"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Thu Jan 19 17:18:25 2012 -0800"
      },
      "committer": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Thu Jan 19 17:18:25 2012 -0800"
      },
      "message": "Merge ee4618bc\n\nChange-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940\n"
    },
    {
      "commit": "39fd8eb956dea32692d3d72b10b64a8597df0a40",
      "tree": "28e2a2d467c3f71d60114859641320f97c99c64a",
      "parents": [
        "9a8ded7348c5b2302dd27b285b395416bc842c49"
      ],
      "author": {
        "name": "Steve Block",
        "email": "steveblock@google.com",
        "time": "Mon Jan 09 18:35:44 2012 +0000"
      },
      "committer": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Thu Jan 19 14:45:08 2012 -0800"
      },
      "message": "Rename LOG_ASSERT to ALOG_ASSERT\n\nChange-Id: Ie2c7ea6560656d65bad791a61996174c75677517\n"
    },
    {
      "commit": "9a8ded7348c5b2302dd27b285b395416bc842c49",
      "tree": "6244771b557279b7b8b8b574821b0afd80f252b2",
      "parents": [
        "aa70226152d2084f85a96b52359dbc8476a86a45"
      ],
      "author": {
        "name": "Steve Block",
        "email": "steveblock@google.com",
        "time": "Fri Jan 06 19:20:56 2012 +0000"
      },
      "committer": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Thu Jan 19 14:45:03 2012 -0800"
      },
      "message": "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)\n\nChange-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924\n"
    },
    {
      "commit": "aa70226152d2084f85a96b52359dbc8476a86a45",
      "tree": "d9514686932670c9cd427232b9653b53ea6c5ca7",
      "parents": [
        "53feeb42c721e8fc9285e35e679906a951f3277c"
      ],
      "author": {
        "name": "Steve Block",
        "email": "steveblock@google.com",
        "time": "Thu Jan 05 23:22:43 2012 +0000"
      },
      "committer": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Thu Jan 19 14:44:59 2012 -0800"
      },
      "message": "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)\n\nChange-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb\n"
    },
    {
      "commit": "53feeb42c721e8fc9285e35e679906a951f3277c",
      "tree": "bb48afd280bf7429d61229bfba2e733aa2805711",
      "parents": [
        "52546c0ef96aa3e7e21482e0f9b6e982557c8da9"
      ],
      "author": {
        "name": "Steve Block",
        "email": "steveblock@google.com",
        "time": "Wed Jan 04 20:05:49 2012 +0000"
      },
      "committer": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Thu Jan 19 14:44:56 2012 -0800"
      },
      "message": "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)\n\nChange-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a\n"
    },
    {
      "commit": "52546c0ef96aa3e7e21482e0f9b6e982557c8da9",
      "tree": "54c28e0c5bf254aa29169a58baba8c1ff10b468e",
      "parents": [
        "3812256de32e73e38ba16e50ac0451c10223d4eb"
      ],
      "author": {
        "name": "Steve Block",
        "email": "steveblock@google.com",
        "time": "Tue Dec 20 16:23:08 2011 +0000"
      },
      "committer": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Thu Jan 19 14:44:50 2012 -0800"
      },
      "message": "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)\n\nChange-Id: I44f267700356967dc51e8f85ebf457dc85cfb229\n"
    },
    {
      "commit": "3812256de32e73e38ba16e50ac0451c10223d4eb",
      "tree": "36738b11682c48374dc44c0b7c2a48a04986a019",
      "parents": [
        "b676a05348e4c516fa8b57e33b10548e6142c3f8"
      ],
      "author": {
        "name": "Steve Block",
        "email": "steveblock@google.com",
        "time": "Thu Oct 20 11:56:00 2011 +0100"
      },
      "committer": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Thu Jan 19 14:44:31 2012 -0800"
      },
      "message": "Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)\n\nChange-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3\n"
    },
    {
      "commit": "90a607163f793b968d96295b876532e4d03b642c",
      "tree": "2adc30973b7511fa56436596aca516f51a6ad4b3",
      "parents": [
        "9e5af59badab79128c03c79534a20f09b6e93cfe",
        "e4b8fa11add55107ec74d7df7c4fe6b57a7f301e"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu Jan 19 13:06:50 2012 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu Jan 19 13:06:50 2012 -0800"
      },
      "message": "Reconcile with ics-mr1-release\n\nChange-Id: I151eb9ed3a43b1576a15e15b343832c8f9e9509b\n"
    },
    {
      "commit": "e4b8fa11add55107ec74d7df7c4fe6b57a7f301e",
      "tree": "5c73ae7daf8480e7ce2cc862790332401688931b",
      "parents": [
        "2774144fa8283f1a7b43e17a53c97dec0c366dd3",
        "7382d6a1b92a54b9a002eb5d4bcc1dcac651c176"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Wed Jan 18 21:17:55 2012 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Wed Jan 18 21:17:55 2012 -0800"
      },
      "message": "merge in ics-mr1-release history after reset to ics-mr1\n"
    },
    {
      "commit": "9e5af59badab79128c03c79534a20f09b6e93cfe",
      "tree": "2adc30973b7511fa56436596aca516f51a6ad4b3",
      "parents": [
        "b45e50a5bce5fba740318d056c8dd1fd9caed354",
        "2774144fa8283f1a7b43e17a53c97dec0c366dd3"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Jan 18 16:08:06 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 18 16:08:06 2012 -0800"
      },
      "message": "am db2e7163: Merge \"AudioFlinger: mix track only when really ready (2)\" into ics-mr1\n\n* commit \u0027db2e71635968f455ad4f41b2e24fb8b909c24ca0\u0027:\n  AudioFlinger: mix track only when really ready (2)\n"
    },
    {
      "commit": "2774144fa8283f1a7b43e17a53c97dec0c366dd3",
      "tree": "5c73ae7daf8480e7ce2cc862790332401688931b",
      "parents": [
        "86d24aa35adf82512d341d9aaebd62b36b0a0847"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Jan 17 19:20:12 2012 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Jan 18 12:27:38 2012 -0800"
      },
      "message": "AudioFlinger: mix track only when really ready (2)\n\nThis problem due to the way audio buffers are mixed when\nlow power mode is active was addressed by commits 19ddf0eb\nand 8a04fe03 but only partially. As a matter of fact, when more\nthan one audio track is playing, the problem is still present.\nThis is most noticeable when playing music with screen off\nand a notification or navigation instruction is played: in this case,\nthe music or notification is likely to skip.\n\nThe fix consists in declaring the mixer ready if all active tracks\nare ready. Previous behavior was to declare ready if at least one track was\nready. To avoid that one application failing to fill the track buffer blocks other\ntracks indefinitely, this condition is respected only if the mixer was ready\nin the previous round.\n\nIssue 5799167.\n\nChange-Id: Iabd4ca08d3d45f563d9824c8a03c2c68a43ae179\n"
    },
    {
      "commit": "9fc4dfb69df0b5a13b7a1904272eb1dcf8113d0c",
      "tree": "9e598654b728141f822b6fb1d2b9ec6303a435dc",
      "parents": [
        "b676a05348e4c516fa8b57e33b10548e6142c3f8"
      ],
      "author": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Wed Dec 22 22:23:06 2010 +0100"
      },
      "committer": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Wed Jan 18 08:16:42 2012 +0200"
      },
      "message": "stagefright aacenc: Add const declarations to some pointers\n\nThis avoids some compilation warnings.\n\nChange-Id: Ia89ab94020a9f1ee4c1df48823fb89325cca7d36\n"
    },
    {
      "commit": "b45e50a5bce5fba740318d056c8dd1fd9caed354",
      "tree": "4d54436f9d0ed116b921d5814a684707bf370210",
      "parents": [
        "bc08dd57fe03b29d5acf53ab21e382b8c5600d33",
        "bcc2252eb16484cf58036146ea5034756dde8027"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Jan 13 11:25:09 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Jan 13 11:25:09 2012 -0800"
      },
      "message": "am d75961ee: am b4cee0f8: Merge \"stagefright aacenc/amrwbenc: Remove trailing whitespace\"\n\n* commit \u0027d75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d\u0027:\n  stagefright aacenc/amrwbenc: Remove trailing whitespace\n"
    },
    {
      "commit": "bcc2252eb16484cf58036146ea5034756dde8027",
      "tree": "2d120ec67c027b9c270b26f2832f515d070d6b75",
      "parents": [
        "22bf648b0b5484834850667664912b660df28585",
        "b676a05348e4c516fa8b57e33b10548e6142c3f8"
      ],
      "author": {
        "name": "Jean-Baptiste Queru",
        "email": "jbq@google.com",
        "time": "Fri Jan 13 11:22:08 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Jan 13 11:22:08 2012 -0800"
      },
      "message": "am b4cee0f8: Merge \"stagefright aacenc/amrwbenc: Remove trailing whitespace\"\n\n* commit \u0027b4cee0f871e0f5a2abd6c6f05b65710b69423f2c\u0027:\n  stagefright aacenc/amrwbenc: Remove trailing whitespace\n"
    },
    {
      "commit": "60866592ed6953f2b0e12cefcd58f1ced26546d0",
      "tree": "565b626f01b6069732464f482ec46b0f7c0f3eb6",
      "parents": [
        "b676a05348e4c516fa8b57e33b10548e6142c3f8"
      ],
      "author": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Thu Jan 12 14:27:01 2012 +0200"
      },
      "committer": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Fri Jan 13 21:21:51 2012 +0200"
      },
      "message": "stagefright aacenc: Properly terminate a comment\n\nThis avoids a warning about /* within a comment.\n\nChange-Id: I9079909734d35db5ab0fd54b46173d7a1848d0c9\n"
    },
    {
      "commit": "721f2bb7b28891c0811a5bea31fa62644131befc",
      "tree": "833966632b2ef5fbeaf77501f1b96585e145cd2c",
      "parents": [
        "b676a05348e4c516fa8b57e33b10548e6142c3f8"
      ],
      "author": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Thu Jan 12 14:25:29 2012 +0200"
      },
      "committer": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Fri Jan 13 21:20:03 2012 +0200"
      },
      "message": "stagefright aacenc: Fix an inline asm constraint\n\nOutput-only parameters should use \u003dr or \u003d\u0026r constrains, never +r.\n\nThis avoids a warning about the variable \u0027result\u0027 being used\nuninitialized.\n\nThis avoids loading the uninitialized value into the register,\nbefore it is overwritten by the multiplication.\n\nChange-Id: I0ef6179e133c35d290feb8e12bea180ecae11a05\n"
    },
    {
      "commit": "9da751147af3222258093d9f41cabf0ea1391c04",
      "tree": "c8253b00e038a984916a2cf5d5c236455b25889b",
      "parents": [
        "d2fdc7129d96391d22065866c612d532dfe411b3"
      ],
      "author": {
        "name": "Mans Rullgard",
        "email": "mans@mansr.com",
        "time": "Tue Apr 05 17:42:38 2011 +0300"
      },
      "committer": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Fri Jan 13 21:16:12 2012 +0200"
      },
      "message": "stagefright aacenc: Fix inline asm\n\n- don\u0027t write input-only registers\n- use temp variables instead of hardcoded regs\n- don\u0027t build constants manually, specify as asm inputs\n- remove unnecessary volatile qualifiers\n\nChange-Id: I3b9bb2d30768bcf409dc478bde4489135eeb50d7\n"
    },
    {
      "commit": "d2fdc7129d96391d22065866c612d532dfe411b3",
      "tree": "0727315211c460f3e8f7c242b766b5259c6ffa20",
      "parents": [
        "b676a05348e4c516fa8b57e33b10548e6142c3f8"
      ],
      "author": {
        "name": "Mans Rullgard",
        "email": "mans@mansr.com",
        "time": "Tue Apr 05 17:42:16 2011 +0300"
      },
      "committer": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Fri Jan 13 21:16:08 2012 +0200"
      },
      "message": "stagefright aacenc: Fix inline asm constraints\n\nOutput-only parameters should use \u003dr or \u003d\u0026r constrains, never +r.\n\nThis fixes a lot of warnings about the variable \u0027result\u0027 being\nused uninitialized.\n\nChange-Id: Ie689fce8c6ecd874d4fc66e87687c67551d9ab6a\n"
    },
    {
      "commit": "132e42c04a58e623efa6cd6ca43641cd80db0f05",
      "tree": "5ba520850408752df6d0811c40d5fd9f71c61087",
      "parents": [
        "b676a05348e4c516fa8b57e33b10548e6142c3f8"
      ],
      "author": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Tue Apr 05 17:33:25 2011 +0300"
      },
      "committer": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Fri Jan 13 21:09:06 2012 +0200"
      },
      "message": "stagefright aacenc: Zero-initialize a struct\n\nThis avoids using uninitialized data in some cases, according\nto valgrind.\n\nChange-Id: I2eb5242b93c4d83a1cf6a15f022ec9579e0742a4\n"
    },
    {
      "commit": "2db3b238966f5f326010321b698fa938d65b8e8a",
      "tree": "188e8961baaa23f24f42da72227a0970ef63f497",
      "parents": [
        "b676a05348e4c516fa8b57e33b10548e6142c3f8"
      ],
      "author": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Tue Apr 05 17:35:49 2011 +0300"
      },
      "committer": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Fri Jan 13 21:05:56 2012 +0200"
      },
      "message": "stagefright aacenc: Fix type definitions for 64 bit platforms\n\nAlso don\u0027t require LINUX to be defined, enable the MSVC typedefs\nonly within _MSC_VER.\n\nThis fixes a lot of warnings about dereferencing pointer \u0027winPtr\u0027\nbreaking strict aliasing rules.\n\nChange-Id: I4afbe0ed81295ebe6e5ee2c7f0fb0cc2dc83c89b\n"
    },
    {
      "commit": "417f62c84261ea17e17a011b1e9706eb997a6ba1",
      "tree": "2cf817cb06baf609e4ce01623a85ad7038d5e909",
      "parents": [
        "b676a05348e4c516fa8b57e33b10548e6142c3f8"
      ],
      "author": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Wed Dec 22 22:09:51 2010 +0100"
      },
      "committer": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Fri Jan 13 20:57:09 2012 +0200"
      },
      "message": "stagefright amrwbenc: Make the mem_malloc function 64-bit safe\n\nChange-Id: Iab0dbfdc6be09c62d353bee46596635686b784a6\n"
    },
    {
      "commit": "891abc0ee089f2ba5b92dcc014e5efc2ef07f01e",
      "tree": "9ddc2ac479c35ac1c0232b9ea9d0db36a9c37aa9",
      "parents": [
        "b676a05348e4c516fa8b57e33b10548e6142c3f8"
      ],
      "author": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Wed Aug 31 10:49:51 2011 +0300"
      },
      "committer": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Fri Jan 13 20:56:42 2012 +0200"
      },
      "message": "stagefright aacenc: Add missing newlines at the end of files\n\nThis avoids compiler warnings about missing newlines.\n\nChange-Id: Ieb2bb7152d794dca47c629588879032d3ba65677\n"
    },
    {
      "commit": "bc08dd57fe03b29d5acf53ab21e382b8c5600d33",
      "tree": "0ddf435e065f725aebbd1a726eb1087f6e5decfb",
      "parents": [
        "a7cbd8e1a52c307cb8aac7d06a777ba2713fed82",
        "7382d6a1b92a54b9a002eb5d4bcc1dcac651c176"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu Jan 12 08:56:17 2012 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Thu Jan 12 08:56:17 2012 -0800"
      },
      "message": "Reconcile with ics-mr1-release\n\nChange-Id: Ie242914fa4cfdf35675bbd2777f0817186860526\n"
    },
    {
      "commit": "b676a05348e4c516fa8b57e33b10548e6142c3f8",
      "tree": "79cbd20823076300dffa09f7afdb3cfa8d5d4231",
      "parents": [
        "a9798d3c1f1c9787975dc0f16e2191da95f2f0da"
      ],
      "author": {
        "name": "Mans Rullgard",
        "email": "mans@mansr.com",
        "time": "Tue Apr 05 17:40:06 2011 +0300"
      },
      "committer": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Thu Jan 12 11:14:04 2012 +0200"
      },
      "message": "stagefright aacenc/amrwbenc: Remove trailing whitespace\n\nThis was applied in AOSP master earlier, in commit\nb21611e5b0f1797e39e781d91ade023bac87637f, but when merged\ninto the Google internal tree in\n88c2d4d26d79384f32a25bd775cf873cb678b12a, none of these\nchanges have been brought in. (The diff of this merge commit\nand its first parent, d94b71d, is empty.)\n\nTherefore, reapply the rest of these changes on the files\nthat still are present in the current version.\n\nChange-Id: I645a9b9134769958a11808a06163123d28d83e46\n"
    },
    {
      "commit": "7382d6a1b92a54b9a002eb5d4bcc1dcac651c176",
      "tree": "0ddf435e065f725aebbd1a726eb1087f6e5decfb",
      "parents": [
        "86d24aa35adf82512d341d9aaebd62b36b0a0847",
        "d9a4d0bdc90c2ad37b0e9a818d8fd5cbbe624c7c"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Wed Jan 11 16:29:04 2012 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Wed Jan 11 16:29:04 2012 -0800"
      },
      "message": "merge in ics-mr1-release history after reset to ics-mr1\n"
    },
    {
      "commit": "a7cbd8e1a52c307cb8aac7d06a777ba2713fed82",
      "tree": "0ddf435e065f725aebbd1a726eb1087f6e5decfb",
      "parents": [
        "b470ec5eb16e08f6d0d24bf79aa76c05fe5543a1",
        "86d24aa35adf82512d341d9aaebd62b36b0a0847"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Jan 11 11:12:45 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Jan 11 11:12:45 2012 -0800"
      },
      "message": "am c15cf3d2: Merge \"stagefright: limit audio gap for looped playback\" into ics-mr1\n\n* commit \u0027c15cf3d286f3d63d141b73f639a5a61ddb028029\u0027:\n  stagefright: limit audio gap for looped playback\n"
    },
    {
      "commit": "86d24aa35adf82512d341d9aaebd62b36b0a0847",
      "tree": "0ddf435e065f725aebbd1a726eb1087f6e5decfb",
      "parents": [
        "60a78ac9535878984b0777788760b9ee7465c5e6"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon Jan 09 13:47:48 2012 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon Jan 09 13:48:25 2012 -0800"
      },
      "message": "stagefright: limit audio gap for looped playback\n\nThe audio gap when looping audio is mostly due to\na delay requested by the audio player when executing\nthe end of stream message. This is to allow the audio\nto be drained out of the pipe before actually stopping the\nAudioTrack.\nThis delay is not needed when looping as the AudioTrack\nis not stopped.\n\nThe fix consists in ignoring the requested delay when the\nlooping flag is set in awesome player.\n\nIssue 5800981.\n\nChange-Id: Ib32d2930c53ecebc21ca8440e6e054c7e20db4a5\n"
    },
    {
      "commit": "b470ec5eb16e08f6d0d24bf79aa76c05fe5543a1",
      "tree": "ec9e13131339633dcd8a9785bdf0db7588020d95",
      "parents": [
        "afb3f7fd1a093c333a90cadfe484fe2643e57031",
        "d9a4d0bdc90c2ad37b0e9a818d8fd5cbbe624c7c"
      ],
      "author": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Jan 06 18:15:13 2012 -0800"
      },
      "committer": {
        "name": "The Android Open Source Project",
        "email": "initial-contribution@android.com",
        "time": "Fri Jan 06 18:15:14 2012 -0800"
      },
      "message": "Reconcile with ics-mr1-release\n\nChange-Id: Id0aeb30eb75c6c4aee7abbc9877aa5b16389778c\n"
    },
    {
      "commit": "d9a4d0bdc90c2ad37b0e9a818d8fd5cbbe624c7c",
      "tree": "ec9e13131339633dcd8a9785bdf0db7588020d95",
      "parents": [
        "60a78ac9535878984b0777788760b9ee7465c5e6",
        "1c03729ed505d5ad66b72ea6ee921d8bb06245c6"
      ],
      "author": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Fri Jan 06 16:32:11 2012 -0800"
      },
      "committer": {
        "name": "The Android Automerger",
        "email": "android-build@android.com",
        "time": "Fri Jan 06 16:32:11 2012 -0800"
      },
      "message": "merge in ics-mr1-release history after reset to ics-mr1\n"
    },
    {
      "commit": "afb3f7fd1a093c333a90cadfe484fe2643e57031",
      "tree": "ec9e13131339633dcd8a9785bdf0db7588020d95",
      "parents": [
        "22bf648b0b5484834850667664912b660df28585",
        "60a78ac9535878984b0777788760b9ee7465c5e6"
      ],
      "author": {
        "name": "Eino-Ville Talvala",
        "email": "etalvala@google.com",
        "time": "Fri Jan 06 15:49:17 2012 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Jan 06 15:49:17 2012 -0800"
      },
      "message": "am 7944704e: Merge \"Switch camera sounds to always use the system enforced audio stream.\" into ics-mr1\n\n* commit \u00277944704e6c4cc10105838b78d3d8403bf66a066b\u0027:\n  Switch camera sounds to always use the system enforced audio stream.\n"
    },
    {
      "commit": "60a78ac9535878984b0777788760b9ee7465c5e6",
      "tree": "ec9e13131339633dcd8a9785bdf0db7588020d95",
      "parents": [
        "071ccd5a9702500f3f7d62ef881300914926184d"
      ],
      "author": {
        "name": "Eino-Ville Talvala",
        "email": "etalvala@google.com",
        "time": "Thu Jan 05 15:34:53 2012 -0800"
      },
      "committer": {
        "name": "Eino-Ville Talvala",
        "email": "etalvala@google.com",
        "time": "Fri Jan 06 10:24:01 2012 -0800"
      },
      "message": "Switch camera sounds to always use the system enforced audio stream.\n\nInstead of picking between the music stream and the enforced audio\nstream, change the camera service to always play sounds through\nenforced system stream. Also update the currently-hidden CameraSound\nAPI to match.\n\nBug: 5778365\nChange-Id: I3cc64b1d1ff567dbac8020a665d5b19846197ff3\n"
    },
    {
      "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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "736d8141e8f060c79c297c5447cdbe2c7fa9e231",
      "tree": "dd64d410e936b9d0a31ca606598ae34153faca4d",
      "parents": [
        "254868809d7df841112209fcbf5c191cce013f81",
        "7e976e926dd8085a64a7add97ce09bfeca26e088"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Dec 09 11:13:39 2011 -0800"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Dec 09 11:13:39 2011 -0800"
      },
      "message": "am ef664f62: Merge \"Fix drm flag setting missed in false drm recognition fix.\" into ics-mr1\n\n* commit \u0027ef664f62a1525e8f53d0937e889333544ffef3ad\u0027:\n  Fix drm flag setting missed in false drm recognition fix.\n"
    }
  ],
  "next": "7e976e926dd8085a64a7add97ce09bfeca26e088"
}