)]}'
{
  "log": [
    {
      "commit": "e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7",
      "tree": "9e7913af62ee68d339a399723f83c4ef05b79d32",
      "parents": [
        "7bc903581f879c86f3881a2f7563bd28c1ac29b7",
        "6a025acb630a3ac4a84715d188aeb48f1946bc3f"
      ],
      "author": {
        "name": "Elliott Hughes",
        "email": "enh@google.com",
        "time": "Wed Feb 04 20:14:50 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Feb 04 20:14:50 2015 +0000"
      },
      "message": "am 6a025acb: am ec0472ba: Merge \"Move AString\\\u0027s StringPrintf out of the way.\"\n\n* commit \u00276a025acb630a3ac4a84715d188aeb48f1946bc3f\u0027:\n  Move AString\u0027s StringPrintf out of the way.\n"
    },
    {
      "commit": "a1e8944a21e5833b7aadc451776f11797f5f9273",
      "tree": "b7f4c150346d21f4862f231160c7df6602509a12",
      "parents": [
        "16e8d463bc5c8805ae6815c67875b16d177a9d8a"
      ],
      "author": {
        "name": "Elliott Hughes",
        "email": "enh@google.com",
        "time": "Wed Feb 04 11:54:28 2015 -0800"
      },
      "committer": {
        "name": "Elliott Hughes",
        "email": "enh@google.com",
        "time": "Wed Feb 04 11:54:28 2015 -0800"
      },
      "message": "Move AString\u0027s StringPrintf out of the way.\n\nWe should come back and replace AString with std::string and switch to the\n\"real\" StringPrintf family, but this fixes the ODR violation that was\npreventing us from booting.\n\nBug: 19265750\nChange-Id: I798eb9ca5dd634e44625af5e583439ef9f0cdc35\n"
    },
    {
      "commit": "a601b86287ab5437a7e9aaf6f09bc171803cdc3d",
      "tree": "5e262eb49429ca1d98f11ee83e68a3a3846ada7a",
      "parents": [
        "82bbd248d0578e5da04aa95d9906006275c330b5",
        "c9e11696c4f80e9803f7e65e29af962f199a574d"
      ],
      "author": {
        "name": "Rachad",
        "email": "rachad@google.com",
        "time": "Mon Feb 02 15:30:01 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Feb 02 15:30:01 2015 +0000"
      },
      "message": "am c9e11696: am 36dca156: Merge \"Acodec: Send framerate information to OMX decoder if available\" into lmp-mr1-dev\n\n* commit \u0027c9e11696c4f80e9803f7e65e29af962f199a574d\u0027:\n  Acodec: Send framerate information to OMX decoder if available\n"
    },
    {
      "commit": "78b01639c08fe5e7e9c1be5e9dc5de560f1383f9",
      "tree": "0187106f6f7e64716a6cc66a57450559fc61d400",
      "parents": [
        "64c496c8d51c71605cd34a510da2ecd8180656ec"
      ],
      "author": {
        "name": "Rachad",
        "email": "rachad@google.com",
        "time": "Thu Jan 29 19:24:08 2015 -0800"
      },
      "committer": {
        "name": "Rachad",
        "email": "rachad@google.com",
        "time": "Thu Jan 29 19:24:08 2015 -0800"
      },
      "message": "Acodec: Send framerate information to OMX decoder if available\n\nBug: 19110889\nChange-Id: Ia8dbe1b77aaac421ec9415884e1248b9b68168dc\n"
    },
    {
      "commit": "9391844deb3f6a442745cea62f78aca2cea19e50",
      "tree": "c8868256f6cbd8e683b45c7fa4e3d56aa26d2574",
      "parents": [
        "b7909adcef247c627fbe8026624b9ecbeba47655",
        "b955b7224382b488a4d8d5663c92118feb8deb1e"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Tue Jan 27 10:04:01 2015 -0800"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Tue Jan 27 10:04:01 2015 -0800"
      },
      "message": "resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aosp\n\nChange-Id: I385371869169eee4fe6330ffe0abc5eda4cb4f72\n"
    },
    {
      "commit": "b7848f1c442bc8c71020957948d1b003a62a25b7",
      "tree": "b0a1dfd418429171c0af5379a1820569775a840b",
      "parents": [
        "1ed13b3b443735e7f7b5002954f31741b0b1c572"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Dec 04 08:57:56 2014 -0800"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Mon Jan 26 07:57:39 2015 -0800"
      },
      "message": "Remove MediaPlayerService::decode()\n\nand make SoundPool use MediaCodec for decoding files to PCM.\n\nBug: 18239054\nChange-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310\n"
    },
    {
      "commit": "17c933cc07be9656aee8afc82dc866a67b3fd78e",
      "tree": "1dbb1c050687cda6d0877c29d60ac80d281a05b3",
      "parents": [
        "7e85361e364bf8f80ab43dd5feb0f584e481019e",
        "cec272dfe2cf6bf6cdb8a4afa5afdd0e910c915f"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Tue Jan 13 23:31:16 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Jan 13 23:31:16 2015 +0000"
      },
      "message": "am cec272df: am 724b9ea5: Merge \"Replace MidiFile player with a Midi extractor\"\n\n* commit \u0027cec272dfe2cf6bf6cdb8a4afa5afdd0e910c915f\u0027:\n  Replace MidiFile player with a Midi extractor\n"
    },
    {
      "commit": "7e85361e364bf8f80ab43dd5feb0f584e481019e",
      "tree": "fbc76909e02d1aab4f53f2ec76063c0ce92fbdd0",
      "parents": [
        "e6453027baf4c79e95b31aa602b18621e3118423",
        "26c73acb73b5af94cb27e5d285d1708d25eb6892"
      ],
      "author": {
        "name": "Rachad",
        "email": "rachad@google.com",
        "time": "Sat Jan 10 02:00:10 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Sat Jan 10 02:00:10 2015 +0000"
      },
      "message": "am 26c73acb: am 0b460ad7: Merge \"ACodec: Added support for E-AC3 decoders\" into lmp-mr1-dev\n\n* commit \u002726c73acb73b5af94cb27e5d285d1708d25eb6892\u0027:\n  ACodec: Added support for E-AC3 decoders\n"
    },
    {
      "commit": "0b460ad7557f6be56aad3fa027d93b38d5995ac4",
      "tree": "12dd16e6b1087cc75aae47c8550f312554efbb86",
      "parents": [
        "38a97bd7891cb0e16f8127510aa81b1b05df3f17",
        "8a4728966dc9c78e21c3c93a927707e93c05e5e0"
      ],
      "author": {
        "name": "Rachad",
        "email": "rachad@google.com",
        "time": "Sat Jan 10 01:31:02 2015 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Sat Jan 10 01:31:02 2015 +0000"
      },
      "message": "Merge \"ACodec: Added support for E-AC3 decoders\" into lmp-mr1-dev"
    },
    {
      "commit": "8840754c5bc44c7e11ed5e9acc15e9569f5814c5",
      "tree": "b3aee3af2d94e1c84729d1d5579a6177b5b05b70",
      "parents": [
        "7993d6b343f2723872dac085756743630371454d",
        "2702d5a073dce89fa3d97c304264b719b187c9fe"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Jan 08 14:00:56 2015 -0800"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Jan 08 14:00:56 2015 -0800"
      },
      "message": "resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aosp\n\nChange-Id: Ic9841f0a66930f57a5ebea527c6a841d7c49cccf\n"
    },
    {
      "commit": "0e8928bf4f2b01b783f6da97d15e8f1abb0fd7d7",
      "tree": "915b24bd6c686000a5c4fb8af920c8a16204e30e",
      "parents": [
        "c52af00beda4477d0fd00c3071e6ffd9c465430b"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Jan 08 13:40:53 2015 -0800"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Jan 08 13:48:52 2015 -0800"
      },
      "message": "Replace MidiFile player with a Midi extractor\n\nThis gets rids of a bunch of special midi handling and replaces it\nwith an extractor that works with NuPlayer and MediaMetadataRetriever.\n\nChange-Id: I8d0f5bbdde2ca24267cf4d62ab26afe9630e0217\n"
    },
    {
      "commit": "bc11e713063f3f96f98256abc81c0d8ee1ddb312",
      "tree": "b45b5c9d24ed7779e2bc6a19d3169c6b79b363a6",
      "parents": [
        "43637c2e0313ed9fea4e4aceb14c166349327aea"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Jan 08 12:26:36 2015 -0800"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Jan 08 12:28:17 2015 -0800"
      },
      "message": "Use callbacks for Midi I/O\n\nInstead of having the Sonivox engine directly open the file and\nuse stdio to read from it, use caller-provided callbacks.\n\nChange-Id: Ie55129109060a4a7862fee3177f994401e00b6c1\n"
    },
    {
      "commit": "7993d6b343f2723872dac085756743630371454d",
      "tree": "3577f12b2dee471ed021462b9ca731fb5e85a51d",
      "parents": [
        "27a78b56e1cf9814971192883cb7d15c186465f7",
        "e03447548d1c56fa9875cac7d500f1012a6b5c26"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Thu Jan 08 17:57:36 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Jan 08 17:57:36 2015 +0000"
      },
      "message": "am e0344754: am 468977f0: Merge \"mark any copyrighted content as protected to disable capture\" into lmp-mr1-dev\n\n* commit \u0027e03447548d1c56fa9875cac7d500f1012a6b5c26\u0027:\n  mark any copyrighted content as protected to disable capture\n"
    },
    {
      "commit": "1713460104b86f6be3a5d9993d9ace864d889b2d",
      "tree": "47be834572c94f418cd6d087e953a53a9d655127",
      "parents": [
        "5db7897ddd32e3ec3ab45ecdb6f21b6265e7e14a"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Jan 07 16:14:34 2015 -0800"
      },
      "committer": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Jan 07 17:08:43 2015 -0800"
      },
      "message": "mark any copyrighted content as protected to disable capture\n\nbug: 18916274\nChange-Id: I23f096b51433bf18a10dc5fe6dc6b75c3881c340\n"
    },
    {
      "commit": "51281663443ea39db9b4c6e2415343e26a6b3fb8",
      "tree": "126b2c46af9297178a9204e608d0ba8454f17269",
      "parents": [
        "991aa3a70b26c7d9c93361394a43a95355c1c26e",
        "69897ae4889328807760ea359ee62efffdaca933"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Mon Jan 05 17:02:32 2015 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Jan 05 17:02:32 2015 +0000"
      },
      "message": "am 69897ae4: am 75afcc1f: Merge \"Use define for drm property keys instead of defining as char pointers\"\n\n* commit \u002769897ae4889328807760ea359ee62efffdaca933\u0027:\n  Use define for drm property keys instead of defining as char pointers\n"
    },
    {
      "commit": "8a4728966dc9c78e21c3c93a927707e93c05e5e0",
      "tree": "6b27f91419fcecb7d06f277b03d74e68676e8d68",
      "parents": [
        "0d19abb440c7e62e944efbeadf02299990f9a589"
      ],
      "author": {
        "name": "Rachad",
        "email": "rachad@google.com",
        "time": "Tue Dec 23 16:10:32 2014 -0800"
      },
      "committer": {
        "name": "Rachad",
        "email": "rachad@google.com",
        "time": "Tue Dec 23 16:10:32 2014 -0800"
      },
      "message": "ACodec: Added support for E-AC3 decoders\n\nBug: 17883772\n\nChange-Id: I05f674c33522eec0e6ceeece88dd800b1857b3ab\n"
    },
    {
      "commit": "c0fcdc07cc3fd44a1fd27fc9b84a5be3651cea22",
      "tree": "97c2aef42582a548f61ddd1487fb850495d5f4a2",
      "parents": [
        "09a1f34f2f45fe01b7dc6a15b15259ba61e47b5b"
      ],
      "author": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Thu Nov 27 22:51:14 2014 +0200"
      },
      "committer": {
        "name": "Martin Storsjo",
        "email": "martin@martin.st",
        "time": "Thu Dec 18 16:31:57 2014 +0200"
      },
      "message": "Use define for drm property keys instead of defining as char pointers\n\nWhen defined as char pointers, every compilation unit that includes\nthe NdkMediaDrm.h header defines a new copy of the same global\nvariables - leading to linker errors due to multiple definitions\nif more than one file includes it.\n\nBy using a define, they don\u0027t generate any symbols. The NdkMediaFormat.h\nheader uses extern const char* for a similar set of keys, but that\ncan\u0027t be added after the actual platform has shipped. The other\nalternative would be to declare them as static const char*, which\nwouldn\u0027t generate global symbols, but which could trigger warnings\nabout unused static symbols instead.\n\nChange-Id: I14ca81d94309b7f437b3bc144920c48a8b3f0261\n"
    },
    {
      "commit": "d7aa535fc6ed1f4f0ee68bd3c7c483717d30205e",
      "tree": "67ff24ec2416909682edb9b160da2ae2ec1752ad",
      "parents": [
        "dc039672b8fad7746200ecc36304d0e85db4f367",
        "06f9952190357426445344090b4e20b8758a118a"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Mon Dec 15 22:41:38 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Dec 15 22:41:38 2014 +0000"
      },
      "message": "am 06f99521: am 2aa82e78: Merge \"MediaCodecList: handle binder death\" into lmp-mr1-dev\n\n* commit \u002706f9952190357426445344090b4e20b8758a118a\u0027:\n  MediaCodecList: handle binder death\n"
    },
    {
      "commit": "eee82e44548f17253c2e06b25725f91c7b549ec2",
      "tree": "cf936ad01c06be9f7e8fe80cf83f73b630de4db7",
      "parents": [
        "8ddb02230d02968d471aa41b22433957c38827c0"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Dec 12 12:27:54 2014 -0800"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Dec 12 20:18:35 2014 -0800"
      },
      "message": "MediaCodecList: handle binder death\n\nBug: 18691591\nChange-Id: Icc402d6ea9b0de4ac642c3b403fb64e865481b2e\n"
    },
    {
      "commit": "3e08ca6709b5a75dc3b779cf3eba8196b08a0245",
      "tree": "0d91cba9d1c188d1898289f6b21826c6f6d316d3",
      "parents": [
        "2592184c976ef83aa9fdad7d63bfdb408c95aa7d",
        "6571ed31d9c967faacd552be238b41088ae11e25"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Dec 11 11:17:51 2014 -0800"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Dec 11 11:17:51 2014 -0800"
      },
      "message": "resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aosp\n\nChange-Id: Ibaea3a0766f75a61964615482a9ef28651a42b37\n"
    },
    {
      "commit": "a0940a569f2bc24b00dc10ce0fa7658b1dc3a3a5",
      "tree": "913e39ed6eff31c956135701290e1a5af21fd0f8",
      "parents": [
        "94a92c69af528edf6ec17d7978a0c3bb6ab51e63"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Sep 24 13:57:35 2014 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Dec 10 18:04:14 2014 -0800"
      },
      "message": "stagefright: misc fixes to software video encoders (and decoders)\n\n- move logic to set encoder parameters to common encoder class\n  (similarly to what was done for decoders)\n- set compressed buffer size based on frame size and compression ratio,\n  and codec-specific minimum size\n- set raw buffer size based on frame size and metadata mode\n- do not set stride and slice height on compressed ports\n- advertise only QCIF support for google H263 encoder\n- set large-enough input size for video decoders to support adaptive\n  playback\n- do not change input buffer size on output port reconfiguration, as\n  no input buffer reallocation takes place\n- do not return empty buffers with EOS after EOS has been signaled\n\nBug: 18513091\nBug: 18639027\nChange-Id: Ib13492ef66adf331aa4572c67d2b283ea020cb41\n"
    },
    {
      "commit": "66b17e9dfe114ae968bfb2f8ad8325527e373c65",
      "tree": "8069ffdd95cd722e4da206b203856d2afe23f154",
      "parents": [
        "b279f5adfa2fd6f22c87b3a7106fbb62a0b9a5d2",
        "f5a968a0d0d3275dc3f69fa827ae7978999e5916"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 10 14:15:03 2014 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Dec 10 14:15:03 2014 -0800"
      },
      "message": "Merge commit \u0027f5a968a0\u0027 into mm\n\nChange-Id: Ifd30546c11def40ad483f27c9d7baa4008fcbac3\n"
    },
    {
      "commit": "b279f5adfa2fd6f22c87b3a7106fbb62a0b9a5d2",
      "tree": "3e53a23fbf31379eab4d76b68af9f6b20b4c7e0c",
      "parents": [
        "a2bc118cfe860f9c108ba089b021d3b003185c56",
        "c49d9cda49dab8b7dd0376cf56476b3e1895d5c6"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Dec 10 21:55:52 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Dec 10 21:55:52 2014 +0000"
      },
      "message": "am c49d9cda: am 2dda40d6: Merge \"audio policy: add support for custom mixes\" into lmp-mr1-dev\n\n* commit \u0027c49d9cda49dab8b7dd0376cf56476b3e1895d5c6\u0027:\n  audio policy: add support for custom mixes\n"
    },
    {
      "commit": "baac183f3808d7b68f184647a97bd381620415fe",
      "tree": "af81e602db02f55eb35852e3d0851499199166ed",
      "parents": [
        "275e8e9de2e11b4b344f5a201f1f0e51fda02d9c"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon Dec 01 17:52:59 2014 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Dec 09 15:47:30 2014 -0800"
      },
      "message": "audio policy: binder calls for dynamic audio policy mixes\n\nAdd binder calls to register and unregister dynamic mixes\nto AudioPolicyManager.\n\nBug: 16009464.\n\nChange-Id: I4ef38166d0cfc88c984970969380d0cd6eb083ac\n"
    },
    {
      "commit": "275e8e9de2e11b4b344f5a201f1f0e51fda02d9c",
      "tree": "c22e1c0b8541aa04fd6c8d803e4fa6704a84e6e2",
      "parents": [
        "82a69ea8b090d57bff5e02774688b546a711bbb8"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Sun Nov 30 15:14:47 2014 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Dec 09 15:47:19 2014 -0800"
      },
      "message": "audio policy: add support for custom mixes\n\nAdd support for custom mixes in AudioPolicyManager.\n\nTwo methods are added to register or unregister a list of custom mixes\nwith their attributes and format.\n\ngetOutputForAttr() and getInputForAttr() first look for a match in\nregistered mixes before defaulting to normal output/input selection\n\nRemote submix device connection disconnection now takes address into\naccount to identify the correspnoding custom mix.\n\nBug: 16009464.\n\nChange-Id: I3f1c2a485a0fb71b1f984ed0adc9b68aa971e408\n"
    },
    {
      "commit": "e09bf82465ff83f4da966b77d551367f7c050154",
      "tree": "48f1fa8084b86bf3586aa6c2edabec5701116a28",
      "parents": [
        "1ed99f0c1b9d7c4fbf2a59b3aeeb4901cc536e5c",
        "6874ed79fd525cf5d6ec8a953475c14f5a185cb4"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Mon Dec 08 19:37:02 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Dec 08 19:37:02 2014 +0000"
      },
      "message": "am 6874ed79: am a9d2f9fb: Merge \"stagefright: preserve output format flags on format change\" into lmp-mr1-dev\n\n* commit \u00276874ed79fd525cf5d6ec8a953475c14f5a185cb4\u0027:\n  stagefright: preserve output format flags on format change\n"
    },
    {
      "commit": "4e865a3cfe4c955e0890321a6b488cf661808b63",
      "tree": "468dc095999eef48d402e92af1b6b80eaed36333",
      "parents": [
        "a147c17adabaab819ac108fbc448c49525cf74bc"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Dec 05 15:54:51 2014 -0800"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Dec 05 16:05:58 2014 -0800"
      },
      "message": "stagefright: preserve output format flags on format change\n\nSome flags are only set in configure, and get lost when output\nformat changes.\n\nBug: 17383204\nChange-Id: I2011bce70920c4ee46fccc378da3b428f3395c11\n"
    },
    {
      "commit": "61280541836947ce0b281b240ffa4c55bbf5bd55",
      "tree": "4a287a2b07095295e7f054399fd9fb3052629d70",
      "parents": [
        "b438123fb1ee0a8c232fd66de658d5382d2083cf",
        "390ef84373b7edd1397381f780ca235326357094"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Nov 27 00:06:00 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Nov 27 00:06:00 2014 +0000"
      },
      "message": "am 390ef843: am f20c4356: Merge \"AudioRecord: use audio attributes instead of audio source.\" into lmp-mr1-dev\n\n* commit \u0027390ef84373b7edd1397381f780ca235326357094\u0027:\n  AudioRecord: use audio attributes instead of audio source.\n"
    },
    {
      "commit": "121143d5242a790d0bd01fe1b9cec5d28a1ba1d7",
      "tree": "ede3e199b33b12c6c5767f2bd566e4664905bada",
      "parents": [
        "0e47b16ffcf78acb81b0ebf14d058db191f74af0",
        "bf14c62e7973ed793a3b00c2c67beca4484c1c7a"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Nov 26 18:41:26 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Nov 26 18:41:26 2014 +0000"
      },
      "message": "am bf14c62e: am 72bf901c: Merge \"audio policy: new getOutputForAttr() prototype.\" into lmp-mr1-dev\n\n* commit \u0027bf14c62e7973ed793a3b00c2c67beca4484c1c7a\u0027:\n  audio policy: new getOutputForAttr() prototype.\n"
    },
    {
      "commit": "caf7f48a0ef558689d39aafd187c1571ff4128b4",
      "tree": "7a2c90732783e2c90cabb6045c4ab0dcea842bf1",
      "parents": [
        "087eb332cdd64026de27c914194127f8fda1a846"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Nov 25 17:50:47 2014 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Nov 25 17:50:47 2014 -0800"
      },
      "message": "AudioRecord: use audio attributes instead of audio source.\n\nAdded AudioRecord constructor with audio attributes.\nReplaced AudioPolicymanager::getInput() by getInputForAttr().\n\nNo new functionality for now.\n\nAlso:\n\n- Fixed warnings in AudioPolicyManager\n- Allocate audio session ID before calling getOutputForAttr() in\nAudioTrack.\n\nBug: 16006090.\nChange-Id: I15df21e4411db688e3096dd801cf579d76d81711\n"
    },
    {
      "commit": "e83b55dc29ca16092ba02f36f55fa6e0e37fd78c",
      "tree": "f8232611b6372b74579e3ed03dfbeb167011d257",
      "parents": [
        "0f78eabb733e1413d7febd00c0bad0f0add02314"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Fri Nov 14 10:06:21 2014 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Nov 25 12:48:19 2014 -0800"
      },
      "message": "audio policy: new getOutputForAttr() prototype.\n\nUpdate getOutputForAttr() prototype and group all logic\ndealing with audio attributes to stream type conversion in\naudio policy manager.\n\ngetOutputForAttr():\n- specifies the audio session (for future use)\n- returns a status code\n- receives either stream type (for legacy) or audio attributes\n- returns an updated streamtype\n\nRemove logic dealing with legacy stream types to attributes conversion\nfrom AudioTrack.\n\nUse correct type for audio sessions in other APIs (startOutput() ...).\n\nreleaseOutput() specifies the audio session (for future use).\n\nBug: 18067208.\n\nChange-Id: I1bfbe9626c04c7955d77f8a70aecfad2cb204817\n"
    },
    {
      "commit": "56df21d760d70a106adfbc8417b6ea179d576e24",
      "tree": "6273f4b4b81bf7000d7d1337e75d6269cb2e55d8",
      "parents": [
        "7ac1df382ad86f0bc7af2c92843978ad8990eee1",
        "f8c2d1665393d8e0620a7129ef3865f34489e6ef"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Nov 21 00:44:00 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Nov 21 00:44:00 2014 +0000"
      },
      "message": "am f8c2d166: am a7cf01da: Merge \"Fix missing loop count for static tracks.\" into lmp-mr1-dev\n\n* commit \u0027f8c2d1665393d8e0620a7129ef3865f34489e6ef\u0027:\n  Fix missing loop count for static tracks.\n"
    },
    {
      "commit": "c9769c557e202df671e35196c8c735b49257be7d",
      "tree": "1a3eac103aea7f8357756241cbe83095ce4dddb5",
      "parents": [
        "d0e12a161471823d1ab269cb608be3f3b0a71ed1",
        "568689b169d8b0ae2cc252b88602db5e5acaa604"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Fri Nov 21 00:43:58 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Nov 21 00:43:58 2014 +0000"
      },
      "message": "am 568689b1: am 3a2a32b5: Merge \"AudioSystem: fix cross deadlock\" into lmp-mr1-dev\n\n* commit \u0027568689b169d8b0ae2cc252b88602db5e5acaa604\u0027:\n  AudioSystem: fix cross deadlock\n"
    },
    {
      "commit": "d0e12a161471823d1ab269cb608be3f3b0a71ed1",
      "tree": "f9a2f2ea19f528495278c1b651db5d75c8306869",
      "parents": [
        "75cfc881e25a9d7647701526484b5885dc43c574",
        "902dc42d79b075395d484ce1c71f215b199aaa2a"
      ],
      "author": {
        "name": "Dan Albert",
        "email": "danalbert@google.com",
        "time": "Thu Nov 20 23:47:28 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Nov 20 23:47:28 2014 +0000"
      },
      "message": "am 902dc42d: am 07715ac3: Merge \"C++11 compatibility.\"\n\n* commit \u0027902dc42d79b075395d484ce1c71f215b199aaa2a\u0027:\n  C++11 compatibility.\n"
    },
    {
      "commit": "36802bd18b7b4e8c87fa019c7e3068bee330d174",
      "tree": "a5c4847a10d5f77a04b9a621174a774d84cb7c31",
      "parents": [
        "de14fae779240a99c53d58ef16ce3086321ff897"
      ],
      "author": {
        "name": "Dan Albert",
        "email": "danalbert@google.com",
        "time": "Thu Nov 20 11:31:17 2014 -0800"
      },
      "committer": {
        "name": "Dan Albert",
        "email": "danalbert@google.com",
        "time": "Thu Nov 20 11:34:32 2014 -0800"
      },
      "message": "C++11 compatibility.\n\n * Fix string literal concatenation to not be interpreted as UD\n   literals.\n * Add constexpr compatibility for non-integral static members.\n * Use __typeof__ instead of typeof (should become decltype once this\n   actually becomes C++11).\n * Add an appropriate cast for atomic_uintptr_t, since moving to C++11\n   means moving from \u003cstdatomic.h\u003e to \u003catomic\u003e, which has better\n   typechecking (hooray for not macros!).\n\nBug: 18466763\nChange-Id: I9561dcb2526578687819ff85421ba80d8e1a9694\n"
    },
    {
      "commit": "a7cf01da547bad8d4e66e3e4570eddeac98b6b05",
      "tree": "a099a86ae62f0ea58c02c3eb61d328fab98f6c51",
      "parents": [
        "574aed902443d41581684dc8bc5ddd2e067f4cdf",
        "cb2129b3b568a4e31bcbda3545a468024bc972fe"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Nov 20 18:36:27 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Nov 20 18:36:27 2014 +0000"
      },
      "message": "Merge \"Fix missing loop count for static tracks.\" into lmp-mr1-dev"
    },
    {
      "commit": "0ebd5f95b68a3a5c9e5509f21938c9e51e74d71b",
      "tree": "0a2939a70644eb37c401705c8211d65bac553743",
      "parents": [
        "18899808001ddaea13fa4c5277502c96351f69a5"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Nov 19 19:04:52 2014 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Nov 20 09:15:02 2014 -0800"
      },
      "message": "AudioSystem: fix cross deadlock\n\nDo not hold gLockAPS when calling\nAudioPolicyService::registerClient() in get_audio_policy_service().\nregisterClient() will need to acquire the AudioPolicyService mutex and\nif at the same time a method called from AudioPolicyService\n(with mutex held) calls back into AudioSystem and get_audio_policy_service()\na cross deadlock occurs.\n\nSame preventive fix for get_audio_flinger().\n\nUse a separate mutex for notification client list in AudioPolicyService.\nThis prevents deadlocking if registerClient() is called as a consequence of\nAudioFlinger calling back into AudioPolicyManager while executing a method\nwith AudioPolicyService locked\n\nBug: 18403952.\nBug: 18450065.\nChange-Id: Ia832e41aede8bc6c843fc615508fbdd74e0863b5\n"
    },
    {
      "commit": "57426fc6486c6c2fa27f4bc6fcf3349282c3fdd7",
      "tree": "bb124ef62b0fecd18f7aa06346f1bc820c44a8f9",
      "parents": [
        "a97f20bb4f5b770cf4d9655b7d3aaf58284aeeea",
        "4fd641be9fed70743ca4fe823b69e74c258ce275"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Nov 19 18:14:04 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Nov 19 18:14:04 2014 +0000"
      },
      "message": "am 4fd641be: am bbda5ce4: Merge \"AudioSystem: Add mutex for output cache\" into lmp-mr1-dev\n\n* commit \u00274fd641be9fed70743ca4fe823b69e74c258ce275\u0027:\n  AudioSystem: Add mutex for output cache\n"
    },
    {
      "commit": "f6778fd0c72ab54328f0e9f5ecf0017b73e99dd8",
      "tree": "8f31be289f16ae8d684699ba80d533b249923e18",
      "parents": [
        "35b0f7095fac4f2cc112edd4b0298a9cb1ee394f"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Nov 18 17:26:58 2014 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Nov 19 09:12:16 2014 -0800"
      },
      "message": "AudioSystem: Add mutex for output cache\n\nFix cross deadlock with AudioFlinger by adding\na dedicated mutex to protect access to cached output list\nand parameters.\n\nBug: 18410728.\nChange-Id: Ia31283b1972d8865a46e84e63695173c187eb781\n"
    },
    {
      "commit": "cb2129b3b568a4e31bcbda3545a468024bc972fe",
      "tree": "87f7c1114770b59e3a6166e7adbb3bcdea8601d2",
      "parents": [
        "97e6ca1a0be83e420ab238d9a1c31d3112126646"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Nov 11 12:17:22 2014 -0800"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Nov 18 17:15:51 2014 -0800"
      },
      "message": "Fix missing loop count for static tracks.\n\nStaticAudioTrackServerProxy::framesReady() previously returned\nonly the contiguous frames, update to return the total\navailable frames. This resolves short-count looping in\nSoundPool for FastTracks.\n\nAlso (1) Removes the racy condition of reading two variables\nand (2) Fixes buffer-\u003emNonContig to return the correct value\nand (3) Restores behavior that loop count of 1 goes back to\nloopStart once during playback.\n\nBug: 11830751\nBug: 12070295\nBug: 17456842\nChange-Id: I64906e6036bb00a1d7375b03efe6deb69d6478ca\n"
    },
    {
      "commit": "8c5ee61a057e3b87e8f0800b284642bf3b107fd0",
      "tree": "9ccc1ab733f8d17f535d455864206a024f8be2c1",
      "parents": [
        "f1b0c671e85d7ad5e1aa94d16336cda57158cd33",
        "d86450b93ab3960ccd68aed14563aaa76b43ce9b"
      ],
      "author": {
        "name": "Chih-hung Hsieh",
        "email": "chh@google.com",
        "time": "Mon Nov 17 20:07:50 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Mon Nov 17 20:07:50 2014 +0000"
      },
      "message": "am d86450b9: am c80b9b83: Merge \"Fix struct vs. class mismatches\"\n\n* commit \u0027d86450b93ab3960ccd68aed14563aaa76b43ce9b\u0027:\n  Fix struct vs. class mismatches\n"
    },
    {
      "commit": "86a58cabe322b746ab0eb17f0cade34ed68ba60e",
      "tree": "cd69742087fbd01d855cbe1b252bf303b3b687be",
      "parents": [
        "9b77083e582a8b6088ac6a2cb4151dfbdd324557"
      ],
      "author": {
        "name": "Bernhard Rosenkränzer",
        "email": "Bernhard.Rosenkranzer@linaro.org",
        "time": "Mon Nov 17 20:14:08 2014 +0100"
      },
      "committer": {
        "name": "Bernhard Rosenkränzer",
        "email": "Bernhard.Rosenkranzer@linaro.org",
        "time": "Mon Nov 17 20:14:08 2014 +0100"
      },
      "message": "Fix struct vs. class mismatches\n\nFix something being declared a struct and forward-declared a class and\nvice versa.\n\ngcc doesn\u0027t care, clang complains about the mismatch.\n\nChange-Id: I7a7a8e9040e3c86fa1d73eb112631ea140861657\nSigned-off-by: Bernhard Rosenkränzer \u003cBernhard.Rosenkranzer@linaro.org\u003e\n"
    },
    {
      "commit": "9ac0177da562b8f4d2ac6f001a16658a76e6aad8",
      "tree": "9943178b96589f9bbd684d410e02425ca292db09",
      "parents": [
        "102b17b8276f1f364f214f5d943d887f61f71765",
        "0e8a3284c6828e561f58e66a014c3b7ee37325cf"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Fri Nov 14 21:41:06 2014 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Nov 14 21:41:06 2014 +0000"
      },
      "message": "am 990dad99: Merge \"remove AudioSystem::getOutputSamplingRateForAttr()\" into lmp-mr1-dev\nautomerge: 0e8a328\n\n* commit \u00270e8a3284c6828e561f58e66a014c3b7ee37325cf\u0027:\n  remove AudioSystem::getOutputSamplingRateForAttr()\n"
    },
    {
      "commit": "990dad996b748fdaa2041cc6d039e96ccfeae6fb",
      "tree": "7456bb2af05b32fa76e611e26c689b13e32d13fc",
      "parents": [
        "cede28e22bce0c92a6d139b51d2c007d2e3f6fca",
        "0d6db582f2ccc9f8943c5f3965e2994b7d137158"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Fri Nov 14 17:40:27 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Nov 14 17:40:28 2014 +0000"
      },
      "message": "Merge \"remove AudioSystem::getOutputSamplingRateForAttr()\" into lmp-mr1-dev"
    },
    {
      "commit": "102b17b8276f1f364f214f5d943d887f61f71765",
      "tree": "144b51b3f2c8d4f2b915422f1f3eb141e96a7c35",
      "parents": [
        "b6c785eeeb8e265a64bc0210bcfbc6332d0291dd",
        "41907c44a597ceb258495715d3dd391fef2907e3"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Nov 14 10:10:14 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Nov 14 10:10:14 2014 +0000"
      },
      "message": "am 41907c44: am cede28e2: Merge \"stagefright: add runtime debug support\" into lmp-mr1-dev\n\n* commit \u002741907c44a597ceb258495715d3dd391fef2907e3\u0027:\n  stagefright: add runtime debug support\n"
    },
    {
      "commit": "cede28e22bce0c92a6d139b51d2c007d2e3f6fca",
      "tree": "fcee5c8e7a56c4fd055afd0e908b6900a77d6cae",
      "parents": [
        "97e6ca1a0be83e420ab238d9a1c31d3112126646",
        "f296e2b262d2a8f7c570eaed454a28cca99eb976"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Nov 14 10:03:46 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Nov 14 10:03:47 2014 +0000"
      },
      "message": "Merge \"stagefright: add runtime debug support\" into lmp-mr1-dev"
    },
    {
      "commit": "b6c785eeeb8e265a64bc0210bcfbc6332d0291dd",
      "tree": "0e8dba373852773c56d0cb58ca595a4229454894",
      "parents": [
        "3c17893c75bfa050c4e422cff417c428d74429e7",
        "08961d0b57f33e0486db2ff135f0f7fa4b1a8c58"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Fri Nov 14 00:02:46 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Nov 14 00:02:46 2014 +0000"
      },
      "message": "am 08961d0b: am 97e6ca1a: Merge \"Stagefright: use MediaCodec in async mode for recording\" into lmp-mr1-dev\n\n* commit \u002708961d0b57f33e0486db2ff135f0f7fa4b1a8c58\u0027:\n  Stagefright: use MediaCodec in async mode for recording\n  audio policy: move intializations to onFirstRef()\n"
    },
    {
      "commit": "97e6ca1a0be83e420ab238d9a1c31d3112126646",
      "tree": "19eff16ab736ee29034f5f68043a5cf07c5fde78",
      "parents": [
        "12acd3f0374e7707ff50c04f8075883be71b128c",
        "1099188151eb63af24ecf542b58d4257bbb8236a"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Thu Nov 13 23:15:06 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Nov 13 23:15:07 2014 +0000"
      },
      "message": "Merge \"Stagefright: use MediaCodec in async mode for recording\" into lmp-mr1-dev"
    },
    {
      "commit": "0d6db582f2ccc9f8943c5f3965e2994b7d137158",
      "tree": "bdd0de4b94942f7490dfe7b59b96bb4fa65a136a",
      "parents": [
        "538596f71dc667b2f39c27d0bc9bbf119b0e6d58"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Nov 12 18:39:44 2014 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Nov 12 18:52:20 2014 -0800"
      },
      "message": "remove AudioSystem::getOutputSamplingRateForAttr()\n\nIt is safer to query the output sampling rate once the output\nhave been acquired by calling getOutputForAttr().\n\nBug: 16009464.\nChange-Id: Ib561facd19fba5359a6b837d75f1a1cd2dc51b29\n"
    },
    {
      "commit": "1099188151eb63af24ecf542b58d4257bbb8236a",
      "tree": "d1f15d781c76f511465da68c6d334ebcaf8b6eac",
      "parents": [
        "868e2f0148b1c491e4fd4839b46d73f6216a058d"
      ],
      "author": {
        "name": "Praveen Chavan",
        "email": "pchavan@codeaurora.org",
        "time": "Thu Oct 16 11:49:14 2014 -0700"
      },
      "committer": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Nov 12 17:22:36 2014 -0800"
      },
      "message": "Stagefright: use MediaCodec in async mode for recording\n\nAsync mode reduces the number of messages posted between\nMediaCodec and MediaCodecSource. This reduces thread\nwakeups and helps reduce CPU utilization.\n\nBug: 18246026\nChange-Id: I4b0837f309fdd12e323c1dfa72525f5a31971a03\n"
    },
    {
      "commit": "f296e2b262d2a8f7c570eaed454a28cca99eb976",
      "tree": "bd87223950d92c27fc69601ddeddbf8e219742e4",
      "parents": [
        "94691b01a94d3ae115a7181c99db58fbeb785c64"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Jun 18 18:08:52 2014 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Nov 12 15:59:04 2014 -0800"
      },
      "message": "stagefright: add runtime debug support\n\nBug: 18285408\nChange-Id: I56346f4652b2c5f7ef5fa3003fd8676051339384\n"
    },
    {
      "commit": "5239bad27472b9ae42be924a98850683e5e70476",
      "tree": "d55d73b27fe1a7c6da8d1831de4d912eca13a802",
      "parents": [
        "f8d051fee37b1a0734e4142072d3053fed8df161",
        "b177468bb1647c79ba48cd0a172cf3306b31ad69"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Nov 07 21:55:30 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Nov 07 21:55:30 2014 +0000"
      },
      "message": "am b177468b: Merge \"Improve AudioTrack recovery from mediaserver death\" into lmp-mr1-dev automerge: e662cd5\n\n* commit \u0027b177468bb1647c79ba48cd0a172cf3306b31ad69\u0027:\n  Improve AudioTrack recovery from mediaserver death\n"
    },
    {
      "commit": "e662cd5cdbe1312d6b74754d2945fffe99e4fe2c",
      "tree": "68e681598ebc7f78ca041a51011652700694f7d8",
      "parents": [
        "1609e451cf6101efe6aeaaa2da61db2cb095c9e8",
        "d2d089fc86c62843992e7d5b371ee9227189a1e6"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Nov 07 21:23:26 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Nov 07 21:23:28 2014 +0000"
      },
      "message": "Merge \"Improve AudioTrack recovery from mediaserver death\" into lmp-mr1-dev"
    },
    {
      "commit": "f8d051fee37b1a0734e4142072d3053fed8df161",
      "tree": "fd1544d8558047bf35d9b9ee84e52f3b080173aa",
      "parents": [
        "caf27abc62e15abc628c04183d3188728fe98990",
        "034d674721029e3b7e34fe30ee31814c521b62bf"
      ],
      "author": {
        "name": "Dan Stoza",
        "email": "stoza@google.com",
        "time": "Fri Nov 07 19:58:27 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Nov 07 19:58:27 2014 +0000"
      },
      "message": "am 034d6747: am 1609e451: Merge \"Add a BufferItem parameter to onFrameAvailable\" into lmp-mr1-dev\n\n* commit \u0027034d674721029e3b7e34fe30ee31814c521b62bf\u0027:\n  Add a BufferItem parameter to onFrameAvailable\n"
    },
    {
      "commit": "1609e451cf6101efe6aeaaa2da61db2cb095c9e8",
      "tree": "f09b7bb9b88d37985ca41e255f4efc8ffa769905",
      "parents": [
        "c339a921642c38621f57e95b4ec41cfaa99c7a63",
        "04f101c35eaa90b1f95939afac30674ec1611e6f"
      ],
      "author": {
        "name": "Dan Stoza",
        "email": "stoza@google.com",
        "time": "Fri Nov 07 19:44:29 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Nov 07 19:44:30 2014 +0000"
      },
      "message": "Merge \"Add a BufferItem parameter to onFrameAvailable\" into lmp-mr1-dev"
    },
    {
      "commit": "caf27abc62e15abc628c04183d3188728fe98990",
      "tree": "b6c08df8ea79f9cdaf4c11d4810790730c6c752b",
      "parents": [
        "0b084690da39cea6ce42a3d3df7e4ba74f46985c",
        "7e88fac080e3bb1cdc95667f82727ea6c19fb173"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Fri Nov 07 18:53:46 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Nov 07 18:53:46 2014 +0000"
      },
      "message": "am 7e88fac0: Merge \"AudioSystem: remove obsolete method.\" into lmp-mr1-dev automerge: c339a92\n\n* commit \u00277e88fac080e3bb1cdc95667f82727ea6c19fb173\u0027:\n  AudioSystem: remove obsolete method.\n"
    },
    {
      "commit": "a36060891425c4ce0621e40344ac473ec14924dd",
      "tree": "f098fd77fb7661b83e3c43f31aec6f30316f4f34",
      "parents": [
        "1cf9ad1abb599ce4057189e0db154cf00b4913f8"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Nov 06 18:07:23 2014 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Nov 06 18:07:23 2014 -0800"
      },
      "message": "AudioSystem: remove obsolete method.\n\nBug: 18067208.\nChange-Id: I9bbf9088485f5162c765ca504d9b784b956234c6\n"
    },
    {
      "commit": "6e0da0226503ddea118d43962a76fa2fa56bad1e",
      "tree": "f181518a435200abbe5efb17a238e112bcde8358",
      "parents": [
        "a4dd2e19f917f25b3eee36f499b126dc115e5446",
        "e0e8223c10e051b73fdcbed4fc67a69df2655c56"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Thu Nov 06 02:49:12 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Nov 06 02:49:12 2014 +0000"
      },
      "message": "am e0e8223c: am 1cf9ad1a: Merge \"Pass resolution to Crypto plugin on format change\" into lmp-mr1-dev\n\n* commit \u0027e0e8223c10e051b73fdcbed4fc67a69df2655c56\u0027:\n  Pass resolution to Crypto plugin on format change\n"
    },
    {
      "commit": "a4dd2e19f917f25b3eee36f499b126dc115e5446",
      "tree": "c11079e94ba87e90ddbe74322bfe9f41e042248d",
      "parents": [
        "5fa013ea79066ec47589f38f94f557d021bd56eb",
        "7ed62fb4a7401adc3e8b4e082bcfa21de443ebbe"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Thu Nov 06 02:49:11 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Nov 06 02:49:11 2014 +0000"
      },
      "message": "am 7ed62fb4: am 19a3f69d: Merge \"Add missing secure stop methods\" into lmp-mr1-dev\n\n* commit \u00277ed62fb4a7401adc3e8b4e082bcfa21de443ebbe\u0027:\n  Add missing secure stop methods\n"
    },
    {
      "commit": "1cf9ad1abb599ce4057189e0db154cf00b4913f8",
      "tree": "1bbf6047da0636dddcac32a904d55c2cd87d2ba0",
      "parents": [
        "19a3f69d9d5398db62ee7b15f2c13052d7ee9f07",
        "2514d080c8a54ff603a45d7e336de668fe7329db"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Thu Nov 06 02:36:17 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Nov 06 02:36:17 2014 +0000"
      },
      "message": "Merge \"Pass resolution to Crypto plugin on format change\" into lmp-mr1-dev"
    },
    {
      "commit": "19a3f69d9d5398db62ee7b15f2c13052d7ee9f07",
      "tree": "cf8ab0afd5e431df089fb7a45499fd1981ba4fc4",
      "parents": [
        "74adca9ad30b7f8a70d40c5237bade0d16c4ea58",
        "3c1285e8f86bd497e14c14fb6df7b42072ef52bd"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Thu Nov 06 02:33:37 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Nov 06 02:33:37 2014 +0000"
      },
      "message": "Merge \"Add missing secure stop methods\" into lmp-mr1-dev"
    },
    {
      "commit": "d2d089fc86c62843992e7d5b371ee9227189a1e6",
      "tree": "9bbab0fe070321be1612e188c835de59375f7e26",
      "parents": [
        "ed1e55c5276a1c031e9b2f016387c7d2fe7bc47f"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Nov 05 11:48:12 2014 -0800"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Nov 05 14:51:19 2014 -0800"
      },
      "message": "Improve AudioTrack recovery from mediaserver death\n\n1. Fix race condition in handling of binder death notifications.\n\nAudioSystem has a mixture of APIs for both ordinary app clients,\nand the AudioFlinger and AudioPolicy services within mediaserver.\nDue to this mix of uses, it is possible for there to be \"surprising\"\nsequences of calls on the call stack.\n\nPreviously, we used a single mutex for all global variables, but\nthis caused a deadlock.  To avoid the deadlock, we unlocked the mutex\nduring the critical sequence of calls.  But this was a a\ncrucial place where it should have stayed locked;\nsee Change-Id I315c1c5066f62b05e1c13b04fae1272b5fbce977\n\nNow we use separate mutexes for the AudioFlinger, AudioPolicy, and audio port\nrelated global variables.  This allows us to correctly hold each mutex\nthroughout the atomic region, even when AudioFlinger calls AudioPolicy\nvia AudioSystem, or vice-versa.\n\n2. AudioSystem::clearAudioConfigCache now clears the IAudioFlinger reference.\n\n3. Make AudioSystem::get_audio_policy_service more like get_audio_flinger.\n\nBug: 18242291\nChange-Id: I9761443d8337df5bf66d4ca2316a9fd0bd11be94\n"
    },
    {
      "commit": "5fa013ea79066ec47589f38f94f557d021bd56eb",
      "tree": "cc484fcfe9b7242e55ac0d311c5850ab122c738e",
      "parents": [
        "d202ac37fc1f5f31e180af55cebd22810a80251b",
        "7e31774e7195bc0479e1a09b2ef8a114e893598f"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Nov 05 22:15:32 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Nov 05 22:15:32 2014 +0000"
      },
      "message": "am 7e31774e: am 74adca9a: IAudioPolicyService: bound array size in queryDefaultPreProcessing\n\n* commit \u00277e31774e7195bc0479e1a09b2ef8a114e893598f\u0027:\n  IAudioPolicyService: bound array size in queryDefaultPreProcessing\n"
    },
    {
      "commit": "74adca9ad30b7f8a70d40c5237bade0d16c4ea58",
      "tree": "13e642689e945e69b76ac095a6bec978debf4084",
      "parents": [
        "ed1e55c5276a1c031e9b2f016387c7d2fe7bc47f"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Nov 05 12:15:36 2014 -0800"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Nov 05 12:33:59 2014 -0800"
      },
      "message": "IAudioPolicyService: bound array size in queryDefaultPreProcessing\n\nBug: 18226810.\nChange-Id: Ib8e2bfe835a8681aac50bf23161db14e50c9a124\n"
    },
    {
      "commit": "04f101c35eaa90b1f95939afac30674ec1611e6f",
      "tree": "638649883fdc1e7329b9334b5a1a7461b7421942",
      "parents": [
        "151b3f41ffcdf187580542ba0c0d3b84df16beed"
      ],
      "author": {
        "name": "Dan Stoza",
        "email": "stoza@google.com",
        "time": "Tue Nov 04 11:32:52 2014 -0800"
      },
      "committer": {
        "name": "Dan Stoza",
        "email": "stoza@google.com",
        "time": "Tue Nov 04 11:32:52 2014 -0800"
      },
      "message": "Add a BufferItem parameter to onFrameAvailable\n\nPasses the BufferItem for the queued buffer to the onFrameAvailable\ncallback so the consumer can track the BufferQueue\u0027s contents.\n\nBug: 18111837\nChange-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0\n"
    },
    {
      "commit": "2514d080c8a54ff603a45d7e336de668fe7329db",
      "tree": "c02e8521f99240935f7c672c9d79846addd785cb",
      "parents": [
        "3c1285e8f86bd497e14c14fb6df7b42072ef52bd"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Mon Nov 03 13:29:35 2014 -0800"
      },
      "committer": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Mon Nov 03 18:39:23 2014 -0800"
      },
      "message": "Pass resolution to Crypto plugin on format change\n\nChange-Id: I56cd557ce3525fe625db8c312d2557d3c8b51101\nrelated-to-bug: 16034599\n"
    },
    {
      "commit": "3c1285e8f86bd497e14c14fb6df7b42072ef52bd",
      "tree": "82c107d9b3001bf4f9d375b7d655968abe20c2c3",
      "parents": [
        "6e8212b2a02685e50d0c093a6f44d9af636261d9"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Oct 31 00:55:16 2014 -0700"
      },
      "committer": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Oct 31 00:55:16 2014 -0700"
      },
      "message": "Add missing secure stop methods\n\nb/18053197\nb/18076411\n\nChange-Id: I923dc893d48c70bf17980007b32f0ac5dfd22896\n"
    },
    {
      "commit": "eb9ee3c08f3e397a726395f8658a087fb659e780",
      "tree": "f368deabda53de2ec8d10291766c6de84ef7aa54",
      "parents": [
        "80f35a97dd633f74475cf1ec5730a3f881c06cc2",
        "ff412661240d6ad34800512cb60841f8b0700107"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Tue Oct 28 00:32:15 2014 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Oct 28 00:32:15 2014 +0000"
      },
      "message": "do not hold mNotifyLock when calling MediaPlayer::notify automerge: df2592b\nautomerge: ff41266\n\n* commit \u0027ff412661240d6ad34800512cb60841f8b0700107\u0027:\n  do not hold mNotifyLock when calling MediaPlayer::notify\n"
    },
    {
      "commit": "df2592beab557663a471da2ac33ca463f7eee722",
      "tree": "3cbf80d5599885efcc103c129c799349bb70790d",
      "parents": [
        "31551f8dd625b8d40961e141d2913b0073f852ab"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Fri Oct 24 18:53:44 2014 -0700"
      },
      "committer": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Mon Oct 27 22:22:57 2014 +0000"
      },
      "message": "do not hold mNotifyLock when calling MediaPlayer::notify\n\nBug:18120688\nChange-Id: Ia66dcfc3fd2d67d1ceba9808d21e0120cc8691d6\n"
    },
    {
      "commit": "11f437a6665167d8aee6db59df6e4753aa190bf7",
      "tree": "77f97ebb0df77973fb9c6c359600d7e9f1f29802",
      "parents": [
        "ccaf667eb6e96a28caedb0d4f776b1ff9c4aed10",
        "edcff417bbb2e76245b559e7c9a8b98c2a60e102"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Oct 22 21:27:05 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Oct 22 21:27:05 2014 +0000"
      },
      "message": "am edcff417: am 42aae0c4: am f04e8b5e: am 25842048: Merge \"stagefright: try to free codec instance if MediaCodec.release hangs\" into lmp-dev\n\n* commit \u0027edcff417bbb2e76245b559e7c9a8b98c2a60e102\u0027:\n  stagefright: try to free codec instance if MediaCodec.release hangs\n"
    },
    {
      "commit": "ccaf667eb6e96a28caedb0d4f776b1ff9c4aed10",
      "tree": "eb31f55de1279c9bbfa88c230b31677ecab4930e",
      "parents": [
        "a968c6e34d028ac81a7997685c3ebfd576ae192e",
        "ffe398116e5049e80ac818dbc621f06fe0196038"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Oct 22 21:27:04 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Wed Oct 22 21:27:04 2014 +0000"
      },
      "message": "am ffe39811: am 8274b049: am cd3fc4e3: am 6ce19d24: Merge \"Stagefright: MediaCodec: shutdown allocated codec on error\" into lmp-dev\n\n* commit \u0027ffe398116e5049e80ac818dbc621f06fe0196038\u0027:\n  Stagefright: MediaCodec: shutdown allocated codec on error\n"
    },
    {
      "commit": "258420480e1edc73b112a5994a8456e31c558860",
      "tree": "d36112992f8402264834df923ff0c7500c11c6de",
      "parents": [
        "6ce19d24ff985cf845f04c2d6542ce03c7d07964",
        "30358faf33fb9b638257b017fadb4c5f7352d903"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Oct 22 00:29:43 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Oct 22 00:29:43 2014 +0000"
      },
      "message": "Merge \"stagefright: try to free codec instance if MediaCodec.release hangs\" into lmp-dev"
    },
    {
      "commit": "30358faf33fb9b638257b017fadb4c5f7352d903",
      "tree": "9cf39ac9b04a8de88c5b1dbd40d2c8631efc2115",
      "parents": [
        "7de5ac1f067ec61f7ea424d5534cfd40987b11fa"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Tue Oct 21 16:07:52 2014 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Tue Oct 21 16:14:11 2014 -0700"
      },
      "message": "stagefright: try to free codec instance if MediaCodec.release hangs\n\nBug: 18033275\nChange-Id: If86cd26566d7b75941976f37829bbec619800778\n"
    },
    {
      "commit": "52dfbee90cc3c4426428318e06a92774f5201198",
      "tree": "3721c673f64eefe2bab9a7065ccc17a6f5109800",
      "parents": [
        "7de5ac1f067ec61f7ea424d5534cfd40987b11fa"
      ],
      "author": {
        "name": "Praveen Chavan",
        "email": "pchavan@codeaurora.org",
        "time": "Wed Oct 15 02:24:34 2014 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Tue Oct 21 11:15:08 2014 -0700"
      },
      "message": "Stagefright: MediaCodec: shutdown allocated codec on error\n\nIf MediaCodec sees a fatal error and transitions to\nUNINITIALIZED state, The codec may still be alive (with an\nexception of \u0027mediaserver-died\u0027 error).\nHandle Shutdown of the codec during release().\n\nBug: 17784012\nBug: 18033275\n\nChange-Id: I891e036499d9b440a57f77fb735a5ba4da9a6e43\n"
    },
    {
      "commit": "3d54bda88e5c0e251c93367c81a316859cc17c1e",
      "tree": "519bc4c4546d53d53050630e01c04878884bec88",
      "parents": [
        "c0db452b030b4e169a3c539847ccba424ba39c81",
        "bd15f216197c1866f0a20d7a4af3eabb9edf6261"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Oct 10 17:14:08 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Fri Oct 10 17:14:08 2014 +0000"
      },
      "message": "am bd15f216: am feea7c3b: am af238382: Merge \"Fix VideoFrame class layout for 64/32 bit\" into lmp-dev\n\n* commit \u0027bd15f216197c1866f0a20d7a4af3eabb9edf6261\u0027:\n  Fix VideoFrame class layout for 64/32 bit\n"
    },
    {
      "commit": "f2ec103dc0583c3eef28e9d797ce2d791775b1ae",
      "tree": "7875aee4675e53fe069ad925bac977887159601a",
      "parents": [
        "60dd0b8fc5fb0e20f110cb4d7eaacdfef17a684a",
        "af238382e33a027494a53556e6104b7245e7213f"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Oct 09 19:38:40 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Thu Oct 09 19:38:40 2014 +0000"
      },
      "message": "am af238382: Merge \"Fix VideoFrame class layout for 64/32 bit\" into lmp-dev\n\n* commit \u0027af238382e33a027494a53556e6104b7245e7213f\u0027:\n  Fix VideoFrame class layout for 64/32 bit\n"
    },
    {
      "commit": "af238382e33a027494a53556e6104b7245e7213f",
      "tree": "87ce15febc15c2063c3655b28214e97929de5660",
      "parents": [
        "ce26e9d13da7a4a4443b9be775bb12fb3ac97d23",
        "04906863a1fa7f296ac11f07e62aa688da39c3ad"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Oct 09 19:34:31 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Oct 09 19:34:31 2014 +0000"
      },
      "message": "Merge \"Fix VideoFrame class layout for 64/32 bit\" into lmp-dev"
    },
    {
      "commit": "04906863a1fa7f296ac11f07e62aa688da39c3ad",
      "tree": "920f274f1058dafcdc3a0c6a4772eba868f09be4",
      "parents": [
        "af1a4dc989d6707116eaefab300ad55124aace66"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Oct 09 09:47:12 2014 -0700"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Oct 09 09:47:12 2014 -0700"
      },
      "message": "Fix VideoFrame class layout for 64/32 bit\n\nThis structure is passed between 64 and 32 bit processes via shared\nmemory, so ensure it\u0027s the same size, and that the members we care\nabout are in the same place.\n\nBug: 17569156\nChange-Id: Id776bc825af1fbf43a6dd3407cca064f6d932902\n"
    },
    {
      "commit": "9d06b8026d551c24527d6f72f134046d94068c46",
      "tree": "c38bef83a039a6c235abcbf5797c60f03e93f0be",
      "parents": [
        "2d15fb26bb0f03623127ed4cde9d546b5d42884e",
        "42fc04ff4db20f2de12834818a73778ec9ede052"
      ],
      "author": {
        "name": "Rachad",
        "email": "rachad@google.com",
        "time": "Tue Oct 07 17:49:12 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Oct 07 17:49:12 2014 +0000"
      },
      "message": "am 42fc04ff: am 584c14c3: Merge \"stagefright: do not allocate output buffers for tunneled playback\" into lmp-dev\n\n* commit \u002742fc04ff4db20f2de12834818a73778ec9ede052\u0027:\n  stagefright: do not allocate output buffers for tunneled playback\n"
    },
    {
      "commit": "292cf155f105915f896877a7be83e46bdf4275d2",
      "tree": "4c741c08a58bb602824d7e6bd97623e4c95df36a",
      "parents": [
        "6160044825b0686e59c11ddbcaf56c8086da4022",
        "584c14c370f141685b7e8963a13ed91584383ca1"
      ],
      "author": {
        "name": "Rachad",
        "email": "rachad@google.com",
        "time": "Tue Oct 07 02:08:10 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Tue Oct 07 02:08:10 2014 +0000"
      },
      "message": "am 584c14c3: Merge \"stagefright: do not allocate output buffers for tunneled playback\" into lmp-dev\n\n* commit \u0027584c14c370f141685b7e8963a13ed91584383ca1\u0027:\n  stagefright: do not allocate output buffers for tunneled playback\n"
    },
    {
      "commit": "584c14c370f141685b7e8963a13ed91584383ca1",
      "tree": "3fec4de36f0907212c5d7f2375f537bcfb3f9c35",
      "parents": [
        "e48b90d634f9e6190a788e6225927d418b11d162",
        "ab76066c11e988ca3d3a5d6d74dd510ae080322e"
      ],
      "author": {
        "name": "Rachad",
        "email": "rachad@google.com",
        "time": "Tue Oct 07 01:56:59 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Oct 07 01:56:59 2014 +0000"
      },
      "message": "Merge \"stagefright: do not allocate output buffers for tunneled playback\" into lmp-dev"
    },
    {
      "commit": "bb2c8147452144a19f45bc2e58f1885cec40b8dc",
      "tree": "8d2a1c83da101086ef1467db9f39383bbf4fa50e",
      "parents": [
        "b4f9e04210fc76ea468cb4fb3c2b20d91b56ce50",
        "dfc2a8f8a7d5062ecb2af4b940e54c3ce52795e3"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Sat Oct 04 16:40:33 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Sat Oct 04 16:40:33 2014 +0000"
      },
      "message": "am dfc2a8f8: am f0011d49: Merge \"MediaRecorder: only dequeue available buffers from MediaCodec\" into lmp-dev\n\n* commit \u0027dfc2a8f8a7d5062ecb2af4b940e54c3ce52795e3\u0027:\n  MediaRecorder: only dequeue available buffers from MediaCodec\n"
    },
    {
      "commit": "6b95616b21c449d9332430fe9500ade56924a3a1",
      "tree": "f2b6e913e3fd0c526a414dd5aa5a22607d8882dd",
      "parents": [
        "e38441d377ae9bdd5a00cbc2351c95cc8d5efdfb",
        "57c27c55006f0137a8ad5a87ec62eb89084dcdc6"
      ],
      "author": {
        "name": "Dan Albert",
        "email": "danalbert@google.com",
        "time": "Sat Oct 04 15:49:30 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Sat Oct 04 15:49:30 2014 +0000"
      },
      "message": "am 57c27c55: am dc28fa7e: Merge \"Add missing #includes\"\n\n* commit \u002757c27c55006f0137a8ad5a87ec62eb89084dcdc6\u0027:\n  Add missing #includes\n"
    },
    {
      "commit": "8d8a489c9a4b813b8e8f1510b3d369516f4b52f2",
      "tree": "148a091a7e0e16257a9ba30841368faf2c179386",
      "parents": [
        "176dda365968a32eec62c440c14ac0d4133241f5",
        "57c27c55006f0137a8ad5a87ec62eb89084dcdc6"
      ],
      "author": {
        "name": "Dan Albert",
        "email": "danalbert@google.com",
        "time": "Sat Oct 04 15:47:22 2014 +0000"
      },
      "committer": {
        "name": "Android Git Automerger",
        "email": "android-git-automerger@android.com",
        "time": "Sat Oct 04 15:47:22 2014 +0000"
      },
      "message": "am 57c27c55: am dc28fa7e: Merge \"Add missing #includes\"\n\n* commit \u002757c27c55006f0137a8ad5a87ec62eb89084dcdc6\u0027:\n  Add missing #includes\n"
    },
    {
      "commit": "f2a64852a4a48c5a3d8a08ffcda20d6884586672",
      "tree": "6f9909217ea845e3d57580240ad00116d7408069",
      "parents": [
        "b220fe0e40bc3752b62a9576fc824634a16fc3ab"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Fri Oct 03 16:12:37 2014 -0700"
      },
      "committer": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Fri Oct 03 23:25:54 2014 +0000"
      },
      "message": "MediaRecorder: only dequeue available buffers from MediaCodec\n\nBug: 17514968\nChange-Id: If232f92d163deb2440b927315c69e0c4d51ca290\n"
    },
    {
      "commit": "a147b4f91143d9f2fb608e22f9fca14bbd029573",
      "tree": "e8a2933109c5955906b7e5f1e61ca1a0093c5633",
      "parents": [
        "c416becd966945fca5fa7fb45ac51f84d1d8cd20"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Oct 01 21:36:51 2014 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Oct 02 09:13:13 2014 -0700"
      },
      "message": "mediarecorder: set level if setting default profile\n\nBug: 17676461\nChange-Id: If01ccd09935945d330de0842be95c3544951b6b9\n"
    },
    {
      "commit": "c416becd966945fca5fa7fb45ac51f84d1d8cd20",
      "tree": "a6c4443573c5dd88f2ecbcf3c84f90d58b689dba",
      "parents": [
        "f916667a017a5a6763afc4808344778570312d5a"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Oct 01 21:30:20 2014 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Oct 01 21:39:03 2014 -0700"
      },
      "message": "stagefright: move math templates into AUtils.h\n\nadd unit test for math templates\n\nBug: 17676461\nChange-Id: Ie964c5fcfcca1ec53b4538f8e577392e8fbb4319\n"
    },
    {
      "commit": "d0b9efe7d8300e48f7a99c1dd746d60060206b3c",
      "tree": "ff063a11d672bb71bbced27740eeac82216ed054",
      "parents": [
        "3af67d03bbc30c368821caf8b74ae7fb91ee7db7",
        "2965f4eb7dceaf1173f0e2d93c11c28293aeead7"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Oct 01 21:37:10 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Oct 01 21:37:11 2014 +0000"
      },
      "message": "Merge \"add AAC audio decoder params for PCM limiter enable\" into lmp-dev"
    },
    {
      "commit": "360d6d0924f99b82ebacb5cfb6f7bca95e11b4ee",
      "tree": "1373f20ae467045842a9d206729ace2700f52bd0",
      "parents": [
        "992626cfe4852f1a2b46ea226b19c2eaa5dcfb89"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Mon Sep 29 14:42:35 2014 -0700"
      },
      "committer": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Wed Oct 01 10:58:30 2014 -0700"
      },
      "message": "GenericSource: support disconnect before NuCachedSource2 is created\n\nBug: 17672488\nChange-Id: I96776c9679fdcfbe9a442c86447c59802b1465ac\n"
    },
    {
      "commit": "2965f4eb7dceaf1173f0e2d93c11c28293aeead7",
      "tree": "7e69324afe5b3b2713b1f5c10bc3d71468197131",
      "parents": [
        "80ec934ae7d4e3a78af87554fdb77a58f6386ba0"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Tue Sep 30 22:02:34 2014 -0700"
      },
      "committer": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Oct 01 10:43:12 2014 -0700"
      },
      "message": "add AAC audio decoder params for PCM limiter enable\n\nBug: 17470065\nChange-Id: Ib67aa1c50e3b6c24c4b12b0f31a996cc6874abd1\n"
    },
    {
      "commit": "ab76066c11e988ca3d3a5d6d74dd510ae080322e",
      "tree": "deb4cccdb021f1e7aa0dd147f187a96b51b43d4c",
      "parents": [
        "9f8551ffa967bd8a4d0a52487a183dcf8b22d91f"
      ],
      "author": {
        "name": "Rachad",
        "email": "rachad@google.com",
        "time": "Mon Sep 22 19:34:31 2014 -0700"
      },
      "committer": {
        "name": "Rachad",
        "email": "rachad@google.com",
        "time": "Sun Sep 28 15:33:34 2014 -0700"
      },
      "message": "stagefright: do not allocate output buffers for tunneled playback\n\nDo not allocate native window buffers for tunneled video playback codecs.\n\nBug: 17112525\nChange-Id: I262d8030a9df6188938fde5d62ebce8faf7dba1f\n"
    },
    {
      "commit": "dff843f2fae88c10fe18d2925a4e802a35d74433",
      "tree": "3415eacab96ae95004c5857280a363b41aaaf622",
      "parents": [
        "6cd6792a3289c0c50542d8113068478dbc3a5ad0"
      ],
      "author": {
        "name": "Bernhard Rosenkraenzer",
        "email": "Bernhard.Rosenkranzer@linaro.org",
        "time": "Sat Sep 27 17:20:50 2014 +0200"
      },
      "committer": {
        "name": "Bernhard Rosenkraenzer",
        "email": "Bernhard.Rosenkranzer@linaro.org",
        "time": "Sat Sep 27 17:20:50 2014 +0200"
      },
      "message": "Add missing #includes\n\nSome header files in stagefright try to use DISALLOW_EVIL_CONSTRUCTORS\n(and even DISALLOW_IMPLICIT_CONSTRUCTORS, which isn\u0027t defined anywhere\nin stagefright) without including the proper header.\n\nWith clang, this results in a build failure - with gcc,\nit results in DISALLOW_EVIL_CONSTRUCTORS/DISALLOW_IMPLICIT_CONSTRUCTORS\nnot doing what they were intended to do, instead appearing as a method\nin the DWARF debug sections of files using the headers.\n\nChange-Id: Ie4e99affe98ed8fb1bfcf5ec604c19dcd5311c62\nSigned-off-by: Bernhard Rosenkraenzer \u003cBernhard.Rosenkranzer@linaro.org\u003e\n"
    },
    {
      "commit": "bb6c9a05840d924b502ce0f1868fca4881ada1ed",
      "tree": "aec6d28b7ab31fec27416c6e853c94c2eedfcd9b",
      "parents": [
        "a935c76f96b066941b34f81c42b3fe9d00db98c5"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Sep 25 14:11:47 2014 -0700"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Sep 25 16:44:07 2014 -0700"
      },
      "message": "audio: fix stream type for accessibility usage\n\nMake sure that accessibility prompts are heard when\na ringtone is active by forcing stream type\nto AUDIO_STREAM_RING when phone state is AUDIO_MODE_RINGTONE.\n\nBug: 17558149.\nChange-Id: Ia3bead8052fca5cbf282c267f7b9b06014fef628\n"
    },
    {
      "commit": "d7f77cd78f5180ba7a04b270d632cc4f9f11718a",
      "tree": "b7110dfa83901fc8da23bda42b35c3205a75114c",
      "parents": [
        "0079b331227fc1555d7c5305f33917a570d44890",
        "dc9f58dc23a86d0635fd8601d1cbc8d47bab0303"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Mon Sep 22 19:01:38 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Sep 22 19:01:38 2014 +0000"
      },
      "message": "Merge \"MediaCodec: Fix deallocated pointer reference when calling reset()\" into lmp-dev"
    },
    {
      "commit": "dc9f58dc23a86d0635fd8601d1cbc8d47bab0303",
      "tree": "2ee7470116618537ff6a11e06c6d87421ed24509",
      "parents": [
        "2973994af39d55b58728df3dca067594e826ea2a"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Thu Sep 18 14:45:57 2014 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Mon Sep 22 10:23:31 2014 -0700"
      },
      "message": "MediaCodec: Fix deallocated pointer reference when calling reset()\n\nThe name pointer argument in MediaCodec::init() was being\nimplicitly deallocated.\n\nBug: 17499622\nChange-Id: If9409f95674e52d1478f969f77693c4d27ff1ff2\n"
    },
    {
      "commit": "0079b331227fc1555d7c5305f33917a570d44890",
      "tree": "9426b791e1d7e14ee3cba19ab38f09d7da7ade83",
      "parents": [
        "39e07162be0680fd30bec7be50628883aa912ffd",
        "96e92b58b7e9647b4c7c2f54b62a1b357ab06b66"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Mon Sep 22 16:03:02 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Sep 22 16:03:03 2014 +0000"
      },
      "message": "Merge \"MediaBuffer: ABuffer will release MediaBuffer when it\u0027s destructed.\" into lmp-dev"
    },
    {
      "commit": "96e92b58b7e9647b4c7c2f54b62a1b357ab06b66",
      "tree": "35b83c45383cf9753b2f48eea71e66d5331165dc",
      "parents": [
        "086c1e3f41a92aa0025a1da1db5dabbfdffaf129"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Sep 18 17:36:20 2014 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Sep 19 19:20:58 2014 -0700"
      },
      "message": "MediaBuffer: ABuffer will release MediaBuffer when it\u0027s destructed.\n\nBug: 17454455\nChange-Id: Ia423bcc2e1fa39137f114eac44912ed15357bb99\n"
    },
    {
      "commit": "6aadfce1d8c972faad7f4437dcd88d8cd3557611",
      "tree": "59e128037e1ba35eab1be1595d72621ce322476e",
      "parents": [
        "2973994af39d55b58728df3dca067594e826ea2a",
        "a0fd9ca66a68baefd9d76800fd66823fd654ef45"
      ],
      "author": {
        "name": "Jean-Michel Trivi",
        "email": "jmtrivi@google.com",
        "time": "Thu Sep 18 22:14:00 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Sep 18 22:14:00 2014 +0000"
      },
      "message": "Merge \"AudioEffect acquires session\" into lmp-dev"
    },
    {
      "commit": "a0fd9ca66a68baefd9d76800fd66823fd654ef45",
      "tree": "c3102c24d002966b7c0038e885296d77136a47c3",
      "parents": [
        "2720c8c45a0040d7007239c100591b9f092b780f"
      ],
      "author": {
        "name": "Jean-Michel Trivi",
        "email": "jmtrivi@google.com",
        "time": "Thu Sep 18 14:07:18 2014 -0700"
      },
      "committer": {
        "name": "Jean-Michel Trivi",
        "email": "jmtrivi@google.com",
        "time": "Thu Sep 18 14:07:18 2014 -0700"
      },
      "message": "AudioEffect acquires session\n\nCurrently, users of audio sessions, AudioTrack and AudioRecord,\n are acquiring and releasing audio sessions according to their\n life-cycle. AudioEffect instances were not counting as users\n of an audio session. This caused an effect used on a session\n to be purged by AudioFlinger::purgeStaleEffects_l() whenever\n the last user of that session went away.\nThis CL makes AudioEffect acquire and release a session when\n created and destroyed.\n\nBug 15432115\n\nChange-Id: I922532150009988d43872f9b5928044a830ae0b3\n"
    },
    {
      "commit": "832666776a681ec3a30ee8fc7d5da9039646147d",
      "tree": "5db9531f473caf0e8f8cce740a997f1ad282edb2",
      "parents": [
        "a87be62b083fb969aeece99d6c29735ef9a5a373",
        "06ad1528e6dd4c866c085d3cad9235d2752eb3ed"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Sep 17 23:15:59 2014 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Sep 17 23:16:00 2014 +0000"
      },
      "message": "Merge \"NuPlayer: use getTimestamp instead of getPosition\" into lmp-dev"
    }
  ],
  "next": "7f1bc8af1c46695191bf7e2aba6467f3616629c0"
}
