)]}'
{
  "log": [
    {
      "commit": "fe0f3d64346e7f3600237b8621c841ef90e9881f",
      "tree": "18bcc120583ecf40858cf31b1cd3a38ac3ed540d",
      "parents": [
        "6de6f70ab7b5b67b2acb60f9db8ff94a0ff7d44d",
        "b25395b1711f680bfc2b285c4f8577c8e9293898"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Jul 26 18:22:31 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 26 18:22:31 2016 +0000"
      },
      "message": "ToneGenerator: Increase buffer framecount am: 7711c90d95\nam: b25395b171\n\nChange-Id: I2cd9e7ea331a323530fa654da15f2a06fbc9a75f\n"
    },
    {
      "commit": "b25395b1711f680bfc2b285c4f8577c8e9293898",
      "tree": "df6a50024ce527717892e43d745ad1899efae4a6",
      "parents": [
        "da440aeb9acf869cd3b58819df9b55068ef97821",
        "7711c90d957514efd5fa68d3fdf269e919a36720"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Jul 26 18:19:46 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 26 18:19:46 2016 +0000"
      },
      "message": "ToneGenerator: Increase buffer framecount\nam: 7711c90d95\n\nChange-Id: I6754d4fa3a9a227ba90ec4b491f499fe57e8582a\n"
    },
    {
      "commit": "309204e2c904c9a22b3a6c3925ed644b343fa3a6",
      "tree": "c387a3ea940f61d77ccecfc93295bf96c4cf0dc0",
      "parents": [
        "14bb98ab2e64e1eeee59430605844bf6a61ecfb4",
        "0e0c9f059b5ec9136367203880757a9b7758e86f"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Jul 26 15:27:06 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 26 15:27:06 2016 +0000"
      },
      "message": "Fix AudioRecord::read and AudioTrack::write return am: 0a2f151f37\nam: 0e0c9f059b\n\nChange-Id: I8b80e1aedf14212856ecabbddd3e3ae037c2b3d2\n"
    },
    {
      "commit": "0e0c9f059b5ec9136367203880757a9b7758e86f",
      "tree": "18de23b2867e5c8ccd9898f029853b148c45b396",
      "parents": [
        "1c1fb278beee64ed090c2257e7fd2c7406730751",
        "0a2f151f37c715078351ae0be99b0c4dbabc2a23"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Tue Jul 26 15:02:04 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 26 15:02:04 2016 +0000"
      },
      "message": "Fix AudioRecord::read and AudioTrack::write return\nam: 0a2f151f37\n\nChange-Id: I9926f0046a6e2f550be852faf4b4d08d8c444260\n"
    },
    {
      "commit": "7711c90d957514efd5fa68d3fdf269e919a36720",
      "tree": "f62994b25978d76851a7395fd775cf038618b590",
      "parents": [
        "11dd692efa611d129167abea854dc14f0046d727"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Mon Jul 25 17:53:23 2016 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Mon Jul 25 19:15:45 2016 -0700"
      },
      "message": "ToneGenerator: Increase buffer framecount\n\nUsing default fast track buffer size made glitches evident;\nincrease to at least process size.\n\nBug: 29345846\nChange-Id: Ib554f31d5f5731dfad481c5e48c26e7c529a2a6b\n"
    },
    {
      "commit": "0a2f151f37c715078351ae0be99b0c4dbabc2a23",
      "tree": "837f0234dd3a5836512f85971f72072a59167afe",
      "parents": [
        "00bbc1d5ee0ad847ed07a273d103e2996862e98b"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Jul 22 08:06:37 2016 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Fri Jul 22 08:06:37 2016 -0700"
      },
      "message": "Fix AudioRecord::read and AudioTrack::write return\n\nvalue to only be one of the documented status codes.\n\nBug: 30158307\nChange-Id: If1ba16ce2ee10ba5ccb1674003a4b8fa086f27bc\n"
    },
    {
      "commit": "a7edc529e64934aeb2044a6e6e69056f4ccbfea0",
      "tree": "26c4964efb36326618157687225fadb116b2b13a",
      "parents": [
        "7c8d572e1a5c6646b336a423febb8ebd1d6c15e9",
        "888de371da1b821975506c6013e2013ed6024e02"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Fri Jul 15 06:17:00 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jul 15 06:17:00 2016 +0000"
      },
      "message": "Merge \\\\\"GenericSource: Allow multiple buffer reads for video\\\\\" into nyc-mr1-dev am: e98f14ff19\nam: 888de371da\n\nChange-Id: I0cb63a7e930acc92408a94fbf2b381f6f1fe2d60\n"
    },
    {
      "commit": "888de371da1b821975506c6013e2013ed6024e02",
      "tree": "ebf7b437aa53304863fb9eafea46205420bd21b1",
      "parents": [
        "e3caed1db3de38d1e60403101390392e77adf815",
        "e98f14ff194bd00ed71574cff19340c1090c78dd"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Fri Jul 15 06:11:36 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jul 15 06:11:36 2016 +0000"
      },
      "message": "Merge \\\"GenericSource: Allow multiple buffer reads for video\\\" into nyc-mr1-dev\nam: e98f14ff19\n\nChange-Id: I8348ecb645e1aef74064bacdbacd8de6c20e4d94\n"
    },
    {
      "commit": "277d08aa27cad359fc8484f4234ae812795acc8d",
      "tree": "bc6bceabd0c9b67af805dd56b7a3f9a8f0c591eb",
      "parents": [
        "fb4c2f10b60c0fbd1f8940c9be746be89464af9e",
        "e8d9d6d8ff2c229313ab7f079ae52445e8ee6b5a"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Thu Jul 14 21:49:17 2016 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Thu Jul 14 21:49:17 2016 -0700"
      },
      "message": "resolve merge conflicts of e8d9d6d to master\n\nChange-Id: I85bc31cb4eab680aee2ba409dddd975e0696b37e\n"
    },
    {
      "commit": "e8d9d6d8ff2c229313ab7f079ae52445e8ee6b5a",
      "tree": "c00daa5723f09a50b5e9203486f32d6f829226f0",
      "parents": [
        "78ef32963c91d4c2e8d4e1cb361987b0438fc7f3",
        "83efe020b94d29132bd4d5cbe049a15abad0095a"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Fri Jul 15 03:37:20 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jul 15 03:37:20 2016 +0000"
      },
      "message": "Merge \\\"IMediaSource: Improve shared memory buffer transfer\\\" into nyc-mr1-dev\nam: 83efe020b9\n\nChange-Id: I20c727525eb2aa9d9858ee59d699c5ae8b81ef1f\n"
    },
    {
      "commit": "cdeb6603d862cec4adac7c39f3b8b240f2b645dc",
      "tree": "839cc37ee4a36e37f7597fccdd7c927e1b314c3e",
      "parents": [
        "f59c0bafebcd795b20141bf928a5cab8ac46e882"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Jun 28 17:21:44 2016 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed Jul 13 12:38:46 2016 -0700"
      },
      "message": "GenericSource: Allow multiple buffer reads for video\n\nBug: 29125703\nChange-Id: I23490a65ad3968d7be561805c9fa742320b5c78a\n"
    },
    {
      "commit": "f59c0bafebcd795b20141bf928a5cab8ac46e882",
      "tree": "13148690f5bcc66bd17c56b4a0f4cd9f5d05b539",
      "parents": [
        "88bd73d9acf5011ef40122fa9a1b43195facbe07"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed Jun 15 17:59:30 2016 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed Jul 13 12:38:33 2016 -0700"
      },
      "message": "IMediaSource: Improve shared memory buffer transfer\n\nBug: 29125703\nChange-Id: Icf1180dee65f6504e6c10dd4d5b28a8e441f67d1\n"
    },
    {
      "commit": "b23a8a8d5d56dc308438d523a66554a3a59227cf",
      "tree": "14fba9434f13b5c22b088f40af919b5a102d9851",
      "parents": [
        "f34c642ce8bb1e51f7674315e3e1ec480c03dec0",
        "464578df7725dc452b35466e469b35e6f39d8e8f"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed Jul 13 02:19:19 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 13 02:19:19 2016 +0000"
      },
      "message": "Merge \\\\\"MediaExtractor: add DrmInitialization in IDataSource.\\\\\" into nyc-mr1-dev am: 489eb9bfaa\nam: 464578df77\n\nChange-Id: I2470062d2da23bd18e647ace03911722f6af6ff9\n"
    },
    {
      "commit": "464578df7725dc452b35466e469b35e6f39d8e8f",
      "tree": "0cedfd7f62bf2bff53016417a3746f199a3f887c",
      "parents": [
        "4bcec886d7a228bef86da16137571306751b99cd",
        "489eb9bfaa7803d1efb022d92eebbdb53d0e0b5f"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed Jul 13 02:07:45 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 13 02:07:45 2016 +0000"
      },
      "message": "Merge \\\"MediaExtractor: add DrmInitialization in IDataSource.\\\" into nyc-mr1-dev\nam: 489eb9bfaa\n\nChange-Id: I91208fea89388be02550c6c8b7a728dd9dd1ee31\n"
    },
    {
      "commit": "2a5e49c984befa066e966cd9af2303a54976f163",
      "tree": "305eb96568ad98fce4823326b48eaa9e085fe48b",
      "parents": [
        "e37b911fbf70c15c652db8585bca2a5f035d9def"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Jul 07 10:02:51 2016 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed Jul 13 00:11:07 2016 +0000"
      },
      "message": "MediaExtractor: add DrmInitialization in IDataSource.\n\nBug: 28901867\nChange-Id: Ic33dc8dc2f5f36239e057d2f2aceeb7738eef968\n"
    },
    {
      "commit": "48b0693c7e74e7c2792e289b3e5a0b6e9c180192",
      "tree": "199d59aa58c268f1c9c3dadda4b4ad91391c30fb",
      "parents": [
        "4099f1a290c4b7980681afa7ba562e6c2450380e",
        "38c26fba02e512c0391878eb6bfc2ed1a88443de"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Jul 12 21:16:23 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 12 21:16:23 2016 +0000"
      },
      "message": "Merge \\\\\\\\\"Fix WaveGenerator memory leak\\\\\\\\\" am: f58e41ab2f am: faf2adda1b am: 9950354362\nam: 38c26fba02\n\nChange-Id: I5c3af1c98cfa7f64632b3be6ec8c1224da5f6d65\n"
    },
    {
      "commit": "38c26fba02e512c0391878eb6bfc2ed1a88443de",
      "tree": "ba8467db6c2e1bf451286d078b7607b9ce1f4761",
      "parents": [
        "6a7f864490766020ef791d6c803364fdb7e79cbb",
        "9950354362178e5f6c22b70e3747ead4fa790841"
      ],
      "author": {
        "name": "Mykola Kondratenko",
        "email": "mykola.kondratenko@sonymobile.com",
        "time": "Tue Jul 12 21:13:02 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 12 21:13:02 2016 +0000"
      },
      "message": "Merge \\\\\\\"Fix WaveGenerator memory leak\\\\\\\" am: f58e41ab2f am: faf2adda1b\nam: 9950354362\n\nChange-Id: I8f83a4c8415a568eaea68a06154a41686b12df6d\n"
    },
    {
      "commit": "faf2adda1b3644079e202c2286c817843ecc115d",
      "tree": "ed5ec331b6be421a38d9ae85b54eac0f9815153f",
      "parents": [
        "b9dc5face85dca184c88c84611da6a3dee18538a",
        "f58e41ab2f182297b3f7337040accbefee16e702"
      ],
      "author": {
        "name": "Mykola Kondratenko",
        "email": "mykola.kondratenko@sonymobile.com",
        "time": "Tue Jul 12 21:06:33 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 12 21:06:33 2016 +0000"
      },
      "message": "Merge \\\"Fix WaveGenerator memory leak\\\"\nam: f58e41ab2f\n\nChange-Id: I4690fad5c3e89abc57cd63e50f30cf0fbbab1294\n"
    },
    {
      "commit": "2b49066e0261377477aef9743a9db82805d0eb8d",
      "tree": "f21a530ce85b38a43d650883c759bc08e5c4661d",
      "parents": [
        "bea67b8a707b8875419019ebd2d568090310b326"
      ],
      "author": {
        "name": "Mykola Kondratenko",
        "email": "mykola.kondratenko@sonymobile.com",
        "time": "Fri Aug 14 15:01:17 2015 +0200"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Jul 12 14:02:32 2016 -0700"
      },
      "message": "Fix WaveGenerator memory leak\n\nReleasing memory with ToneGenerator::stopTone() depends on\nToneGenerator::mState that can cause memory leak in case\nmState is TONE_INIT.\n\nRemove dependency to mState by adding ToneGenerator::clearWaveGens()\nexplicit call in ToneGenerator destructor.\n\nBug: 29916937\n\nChange-Id: I5ccfbca9f2ae1abac9e160a2a309fb6962d4a110\n"
    },
    {
      "commit": "f58e41ab2f182297b3f7337040accbefee16e702",
      "tree": "808186cae141c4fffc0397260f6f93f9ed0fdce5",
      "parents": [
        "d2a52727e30c6c413f3837378d990444fe7ac319",
        "f1af17aa70d810b1184f90416efa3287976392a6"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Jul 12 21:00:12 2016 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue Jul 12 21:00:12 2016 +0000"
      },
      "message": "Merge \"Fix WaveGenerator memory leak\""
    },
    {
      "commit": "f1af17aa70d810b1184f90416efa3287976392a6",
      "tree": "733a20e8ec24ef50ac2397261409950981a78e14",
      "parents": [
        "eb0482990aaf115ac351cbf8751d7536cb5036d4"
      ],
      "author": {
        "name": "Mykola Kondratenko",
        "email": "mykola.kondratenko@sonymobile.com",
        "time": "Fri Aug 14 15:01:17 2015 +0200"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Jul 12 16:16:19 2016 +0000"
      },
      "message": "Fix WaveGenerator memory leak\n\nReleasing memory with ToneGenerator::stopTone() depends on\nToneGenerator::mState that can cause memory leak in case\nmState is TONE_INIT.\n\nRemove dependency to mState by adding ToneGenerator::clearWaveGens()\nexplicit call in ToneGenerator destructor.\n\nBug: 29916937\n\nChange-Id: I5ccfbca9f2ae1abac9e160a2a309fb6962d4a110\n"
    },
    {
      "commit": "818e974ecbca1150301be50492867403876fddd7",
      "tree": "b66d1eb368778f46366b795af9eae575bacdd418",
      "parents": [
        "2f38445afabbaaa30c1b12489398ad8eb675f221",
        "b01ac3856987aa4cf3176b6e676e4dd9a27dddc8"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Fri Jul 01 18:10:10 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jul 01 18:10:10 2016 +0000"
      },
      "message": "resolve merge conflicts of c9a7b55 to nyc-mr1-dev-plus-aosp\nam: b01ac38569\n\nChange-Id: I5be64fe803d7a85a387342031d9d5ab280b98c47\n"
    },
    {
      "commit": "b01ac3856987aa4cf3176b6e676e4dd9a27dddc8",
      "tree": "593ddd402e4cced409a9f64ddfdfb49c3cdd6d4c",
      "parents": [
        "64a4f4caaef4d4aad7e0794ea4f9b8a233ad7cb5",
        "c9a7b558434b0c266dd095f786ca0a14c5a1f24a"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Fri Jul 01 10:56:46 2016 -0700"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Fri Jul 01 10:56:46 2016 -0700"
      },
      "message": "resolve merge conflicts of c9a7b55 to nyc-mr1-dev-plus-aosp\n\nChange-Id: I07b5b3213dd034ebed781648ccc8158c077f493f\n"
    },
    {
      "commit": "1bcae276ab189c364393d6971ed8a7d5e6376498",
      "tree": "50c5cfbcef39c4daeb482290fa57372173065dbe",
      "parents": [
        "7a9c55c5cedf46ef4f6b3de034634312bd1ff0ee"
      ],
      "author": {
        "name": "Lukasz Wasowicz",
        "email": "lukasz.wasowicz@sonymobile.com",
        "time": "Tue Oct 06 15:51:16 2015 +0200"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Jun 30 18:08:01 2016 -0700"
      },
      "message": "Fix for wrong ringtone when using VoWiFi\n\nIf operator goes into flight mode and tries to make call via WiFi, then\nproperty \"gsm.operator.iso-country\" is read as empty string and in\nconsequence mRegion is set as CEPT instead of specific country-area\nname (e.g. instead of UNITED_KINGDOM).\n\nWe may check additional property that does not depend on network\noperator: \"gsm.sim.operator.iso-country\" so that we could set mRegion\nproperly.\n\nBug: 29494265\n\nChange-Id: Ia374f73159e005431fb0ad9bf8b5dbb3d9a3e294\n"
    },
    {
      "commit": "7a9c55c5cedf46ef4f6b3de034634312bd1ff0ee",
      "tree": "012a19a73ae8616b2a49c81e3cb1e32dcf1a263f",
      "parents": [
        "3743febf9567e849ce580ddc68579237d96e5a55"
      ],
      "author": {
        "name": "tadashi.aoyama",
        "email": "tadashi.xa.aoyama@sonymobile.com",
        "time": "Mon Apr 18 18:30:46 2016 +0900"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Jun 30 18:06:32 2016 -0700"
      },
      "message": "Fix tone region(for US, CA and JP) recognition for dual SIM\n\nValue of \"gsm.operator.iso-country\" differs between the case of single\nSIM device and the case of dual SIM device with only one SIM enabled.\nThis change makes ToneGenerator detect region in case there is only\none SIM enabled in dual SIM device.\n\nChange-Id: I771858ec9d85054d90d7d8141266655b42b093b9\n"
    },
    {
      "commit": "3743febf9567e849ce580ddc68579237d96e5a55",
      "tree": "2e17b16a85fc4b402ff25d710351927f821a4394",
      "parents": [
        "d023a7707fe551817fb3f7539f68a388b3381f41"
      ],
      "author": {
        "name": "takafumi nakamura",
        "email": "takafumi.x.nakamura@sonymobile.com",
        "time": "Fri Nov 20 18:09:02 2015 +0900"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Thu Jun 30 18:04:29 2016 -0700"
      },
      "message": "Add the conditions that determine the region for US, CA and JP\n\nRegion is incorrect when dual SIM is inserted.\nToneGenerator class doesn\u0027t consider the dual SIM use case,\nso region is always set to a default value(CEPT) even if\nthese country\u0027s dual SIMs are inserted.\n\nChange-Id: Iad684856f550b50345b71d8c07e99e27f87407a7\n"
    },
    {
      "commit": "ce4df5e534eb86748fe80c84efb6b7fc0b6b5b46",
      "tree": "efdb401983c0780f158072921e85b3c24cf7dc15",
      "parents": [
        "38f56e4b988b0fadbf12970b3d69bd3f84da6263"
      ],
      "author": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Fri Mar 04 18:22:15 2016 +0900"
      },
      "committer": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Tue Jun 28 16:28:26 2016 +0900"
      },
      "message": "stagefright: move MedaDefs from libstagefright to libmedia\n\nBug: 24761407\nChange-Id: If4914340a645c6f3c14eea0c873c162926d72ca2\n"
    },
    {
      "commit": "d52f324a2663c72ec7fa1137a2e202e20d3f1497",
      "tree": "32fe4dc84f8c94fcd29d32bff06072c3957fa46d",
      "parents": [
        "0f000457a05f3bd88c8807c1c6de236d69b5b724",
        "3cb0ba5bb5042275372c899e4b3aa745a3d465df"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Jun 23 19:18:01 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jun 23 19:18:01 2016 +0000"
      },
      "message": "Merge \\\\\\\"Revert \\\\\\\"Restore old signature for acquire/release session\\\\\\\"\\\\\\\" into nyc-dev am: 6e70614750 am: 6a725defdf\nam: 3cb0ba5bb5\n\nChange-Id: I3f3550a74e6a82cb9a13649119a72b006419364d\n"
    },
    {
      "commit": "3cb0ba5bb5042275372c899e4b3aa745a3d465df",
      "tree": "4fb5948ecba8245bc477d6d7efc0299224f72d3f",
      "parents": [
        "1a6dd84ee8754065e3970ef6a1abb2ea9b1a9ecf",
        "6a725defdfeac9ba1d608504a87ea9095c73db55"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Jun 23 18:54:53 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jun 23 18:54:53 2016 +0000"
      },
      "message": "Merge \\\\\"Revert \\\\\"Restore old signature for acquire/release session\\\\\"\\\\\" into nyc-dev am: 6e70614750\nam: 6a725defdf\n\nChange-Id: I8591cfa0ac94a3dd13c97a596e48f7647adda69f\n"
    },
    {
      "commit": "793caf8a76375aff3c22af4db7489859408f9b10",
      "tree": "600c99a510e2b57ed6a42dd333e0144029698e7e",
      "parents": [
        "dc43ff40e32db2ce14d21ce25ce8a0f887cf9aa9",
        "6e70614750e8100f86fb4cb0f010b49aef39b3a1"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Jun 23 18:54:43 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jun 23 18:54:43 2016 +0000"
      },
      "message": "Merge \\\"Revert \\\"Restore old signature for acquire/release session\\\"\\\" into nyc-dev\nam: 6e70614750\n\nChange-Id: Icbbcfdbbfce7ce8f00e40e58c9a13d1a1a245f37\n"
    },
    {
      "commit": "6a725defdfeac9ba1d608504a87ea9095c73db55",
      "tree": "b602766ddb7006e2aedb30a41e2c82de1c6edd0c",
      "parents": [
        "20ca8a71cbb39cac7eeb0c17bb2df3e0f941ee6d",
        "6e70614750e8100f86fb4cb0f010b49aef39b3a1"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Jun 23 18:46:26 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jun 23 18:46:26 2016 +0000"
      },
      "message": "Merge \\\"Revert \\\"Restore old signature for acquire/release session\\\"\\\" into nyc-dev\nam: 6e70614750\n\nChange-Id: Ia4d3883803cdf91f0459e8549523cadb64afba51\n"
    },
    {
      "commit": "6e70614750e8100f86fb4cb0f010b49aef39b3a1",
      "tree": "6e80d1039323547988dc955d6acfed9bdc4b8d67",
      "parents": [
        "ef9cab1d86054d8ab17056990e0264e1ccb826c1",
        "fc5c22b0c574f97fbf5c87f9a01b4d60e27e6b37"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Jun 23 18:39:32 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Jun 23 18:39:32 2016 +0000"
      },
      "message": "Merge \"Revert \"Restore old signature for acquire/release session\"\" into nyc-dev"
    },
    {
      "commit": "fc5c22b0c574f97fbf5c87f9a01b4d60e27e6b37",
      "tree": "77b47550a981fab12c83ffc87baf7f2a203fcf26",
      "parents": [
        "2d51b7c18ad0ffd142d7ba94203f52ba3f735530"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Jun 23 18:04:48 2016 +0000"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Jun 23 18:04:48 2016 +0000"
      },
      "message": "Revert \"Restore old signature for acquire/release session\"\n\nThis reverts commit 2d51b7c18ad0ffd142d7ba94203f52ba3f735530.\n\nChange-Id: I8e17813b9639d8e928bcfa348d21c45fb8b5f846\n"
    },
    {
      "commit": "aaddfa248b8d4ed8961454a4f3ee0f535668f809",
      "tree": "3c25472a289f4bdd4ab9ee9cac48ff01418e9a6e",
      "parents": [
        "80fac8cf33fcdb2ee7fa7daa74dd901428edb221",
        "c3b8968cb434fcdf270bb9eaaa96f859c4c14f58"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Jun 23 16:18:34 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jun 23 16:18:34 2016 +0000"
      },
      "message": "Merge \\\\\\\"Restore old signature for acquire/release session\\\\\\\" into nyc-dev am: ef9cab1d86 am: 20ca8a71cb\nam: c3b8968cb4\n\nChange-Id: I0acc82b1b4b4365417bdf0e6263552745fa2d030\n"
    },
    {
      "commit": "c3b8968cb434fcdf270bb9eaaa96f859c4c14f58",
      "tree": "8f73ef63510c95a8a5e39cbda2fb9b29defb6776",
      "parents": [
        "fcde3a9372a759837bcb645cc78ad707a5ac0025",
        "20ca8a71cbb39cac7eeb0c17bb2df3e0f941ee6d"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Jun 23 16:14:12 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jun 23 16:14:12 2016 +0000"
      },
      "message": "Merge \\\\\"Restore old signature for acquire/release session\\\\\" into nyc-dev am: ef9cab1d86\nam: 20ca8a71cb\n\nChange-Id: Iafa989fcaab7678cfc5b4d6305322591e717caa3\n"
    },
    {
      "commit": "dc43ff40e32db2ce14d21ce25ce8a0f887cf9aa9",
      "tree": "f572ff784282780fd95ee831231112f1570e23f5",
      "parents": [
        "51e36de79d5c0041713302114d41077cebdc9e92",
        "ef9cab1d86054d8ab17056990e0264e1ccb826c1"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Jun 23 16:09:42 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jun 23 16:09:42 2016 +0000"
      },
      "message": "Merge \\\"Restore old signature for acquire/release session\\\" into nyc-dev\nam: ef9cab1d86\n\nChange-Id: I2de74604cdf21c4535904f9c913392952943d3b5\n"
    },
    {
      "commit": "20ca8a71cbb39cac7eeb0c17bb2df3e0f941ee6d",
      "tree": "54a978c20c52c756be8d945c23919c5fd5adfc9d",
      "parents": [
        "59e8b1dce95a608e2d88211191684f576ff8c5a3",
        "ef9cab1d86054d8ab17056990e0264e1ccb826c1"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Jun 23 16:09:42 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jun 23 16:09:42 2016 +0000"
      },
      "message": "Merge \\\"Restore old signature for acquire/release session\\\" into nyc-dev\nam: ef9cab1d86\n\nChange-Id: Ie5af8a39ffc8709b0d804927b2db5d13871492e0\n"
    },
    {
      "commit": "ef9cab1d86054d8ab17056990e0264e1ccb826c1",
      "tree": "fa883848b73b2cf4362aa5f04ce91aa5ea182823",
      "parents": [
        "8e97c04ab7ed711d3dd65e73c7a760e2f192f2b2",
        "2d51b7c18ad0ffd142d7ba94203f52ba3f735530"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Jun 23 16:04:18 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Jun 23 16:04:18 2016 +0000"
      },
      "message": "Merge \"Restore old signature for acquire/release session\" into nyc-dev"
    },
    {
      "commit": "2d51b7c18ad0ffd142d7ba94203f52ba3f735530",
      "tree": "30c6aa1c1a33e3610a7456edba7e51bb72a7b7bf",
      "parents": [
        "fd15c3fac93c2be5e038a6fa684ca293a8e07af7"
      ],
      "author": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Jun 23 08:52:26 2016 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Thu Jun 23 08:52:26 2016 -0700"
      },
      "message": "Restore old signature for acquire/release session\n\nBug: 29490416\nChange-Id: Iaf6be0666937c6fa625f936839f5a04d58350640\n"
    },
    {
      "commit": "03a298348baac8b1bb0bf6b4ad3549f76e3c4db1",
      "tree": "32fe4dc84f8c94fcd29d32bff06072c3957fa46d",
      "parents": [
        "5a3cac87fd744ee4768c9424ac12451f908524b3",
        "b18af48e3c1e64aa99954eaf04ed857b61a135aa"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed Jun 22 20:18:00 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jun 22 20:18:00 2016 +0000"
      },
      "message": "Merge \\\\\\\"Limit cached timestamp use if HW fails to provide them\\\\\\\" into nyc-dev am: 0256917c88 am: aeffd19df0\nam: b18af48e3c\n\nChange-Id: I628b8869bb7dd183270a6309c6e70072786e00b5\n"
    },
    {
      "commit": "b18af48e3c1e64aa99954eaf04ed857b61a135aa",
      "tree": "4fb5948ecba8245bc477d6d7efc0299224f72d3f",
      "parents": [
        "d34b3d544b3da2f699526f38621b4bb2d4142561",
        "aeffd19df0a23cfcd09ef81ba136ce02ec76a37a"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed Jun 22 20:05:47 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jun 22 20:05:47 2016 +0000"
      },
      "message": "Merge \\\\\"Limit cached timestamp use if HW fails to provide them\\\\\" into nyc-dev am: 0256917c88\nam: aeffd19df0\n\nChange-Id: I6f4c59ef161ef67395adecba15592868acc1b545\n"
    },
    {
      "commit": "aeffd19df0a23cfcd09ef81ba136ce02ec76a37a",
      "tree": "600c99a510e2b57ed6a42dd333e0144029698e7e",
      "parents": [
        "311b46f57e43c62615d0abf78546ede5491b5db0",
        "0256917c88690e07604f725872321cbe2870ed8b"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed Jun 22 20:00:59 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jun 22 20:00:59 2016 +0000"
      },
      "message": "Merge \\\"Limit cached timestamp use if HW fails to provide them\\\" into nyc-dev\nam: 0256917c88\n\nChange-Id: I1186034edf91d3b136b2571fa0acadc9b21de891\n"
    },
    {
      "commit": "ed61ffb179f0f5154ae9c7fa8b76fba28f686b71",
      "tree": "b602766ddb7006e2aedb30a41e2c82de1c6edd0c",
      "parents": [
        "b8ef3dc52eea062a031a1bc565e295679cc22f5e",
        "0256917c88690e07604f725872321cbe2870ed8b"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed Jun 22 20:00:59 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jun 22 20:00:59 2016 +0000"
      },
      "message": "Merge \\\"Limit cached timestamp use if HW fails to provide them\\\" into nyc-dev\nam: 0256917c88\n\nChange-Id: Ia0c7b61ec235f277f0266dac3320d25cdfeba4f0\n"
    },
    {
      "commit": "07eee80b3422c0304491f24bbc415deb0badbefc",
      "tree": "9fca1712dc24e9e7ca66ea8c394c6bbf6c5c2946",
      "parents": [
        "37a9de26f6403955a19b81ce5ffe87998e9bf46e"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue Jun 21 16:47:16 2016 -0700"
      },
      "committer": {
        "name": "Glenn Kasten",
        "email": "gkasten@google.com",
        "time": "Wed Jun 22 18:37:59 2016 +0000"
      },
      "message": "Limit cached timestamp use if HW fails to provide them\n\nOn some devices, if the HDMI cable is disconnected during use,\ncached timestamp info can become very old.\n\nBug: 29423451\nChange-Id: Ieecf5e98bad14d00b4f5f14b032c2cf66ae94ceb\n"
    },
    {
      "commit": "53f3301c924fcd865ec99abb865b805e02ab1451",
      "tree": "d0b0100d2af79f8af93841b4a1a5f5a66630d2e5",
      "parents": [
        "63a05b4d8510102256fcb1147d5148d5d632117f",
        "6c6cd5f24b25a19f311fe00680588cb5e49a94a5"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Jun 21 15:45:07 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jun 21 15:45:07 2016 +0000"
      },
      "message": "Merge \\\\\\\\\"Fix for wrong ringtone when using VoWiFi\\\\\\\\\" am: e3596517c1 am: 87f033a1ee am: 357b84734c\nam: 6c6cd5f24b\n\nChange-Id: Id6cfb7c108bd9e7168412bfa45eb865552f36a3a\n"
    },
    {
      "commit": "6c6cd5f24b25a19f311fe00680588cb5e49a94a5",
      "tree": "bfdb75e17fade43857bbc97c38caf1397082341c",
      "parents": [
        "2153c13ed964f9ee8fd40e10deecb5b8d9ab145a",
        "357b84734c6197575f9dcd6132cc1e204df6e33b"
      ],
      "author": {
        "name": "Lukasz Wasowicz",
        "email": "lukasz.wasowicz@sonymobile.com",
        "time": "Tue Jun 21 15:36:43 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jun 21 15:36:43 2016 +0000"
      },
      "message": "Merge \\\\\\\"Fix for wrong ringtone when using VoWiFi\\\\\\\" am: e3596517c1 am: 87f033a1ee\nam: 357b84734c\n\nChange-Id: I97f96c9797af9994f41258c8cae3eda4eceeb290\n"
    },
    {
      "commit": "87f033a1eee7af1dd41c8de8263c72f1c3d61c82",
      "tree": "2fcc881021d3c56f7a832bf19c558292de2410cc",
      "parents": [
        "f8f2f89cf1781091cba8ce8ce6f38bc6ad069dff",
        "e3596517c1df94158e47b5ecc41dc0ac09091943"
      ],
      "author": {
        "name": "Lukasz Wasowicz",
        "email": "lukasz.wasowicz@sonymobile.com",
        "time": "Tue Jun 21 15:31:10 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jun 21 15:31:10 2016 +0000"
      },
      "message": "Merge \\\"Fix for wrong ringtone when using VoWiFi\\\"\nam: e3596517c1\n\nChange-Id: I70e9055b946e92cf21c384ac263dbea0d679b23b\n"
    },
    {
      "commit": "39390358583684e1703e7f19321725c88313fcaa",
      "tree": "a3ce6a696034f78825b3017d1263836f40820961",
      "parents": [
        "42cf4c39dcfc7c2cbd9fa3e6769dcd130d56c171"
      ],
      "author": {
        "name": "Lukasz Wasowicz",
        "email": "lukasz.wasowicz@sonymobile.com",
        "time": "Tue Oct 06 15:51:16 2015 +0200"
      },
      "committer": {
        "name": "Takahiro Aizawa",
        "email": "Takahiro.Aizawa@sonymobile.com",
        "time": "Mon Jun 20 08:00:29 2016 +0000"
      },
      "message": "Fix for wrong ringtone when using VoWiFi\n\nIf operator goes into flight mode and tries to make call via WiFi, then\nproperty \"gsm.operator.iso-country\" is read as empty string and in\nconsequence mRegion is set as CEPT instead of specific country-area\nname (e.g. instead of UNITED_KINGDOM).\n\nWe may check additional property that does not depend on network\noperator: \"gsm.sim.operator.iso-country\" so that we could set mRegion\nproperly.\n\nBug: 29494265\n\nChange-Id: Ia374f73159e005431fb0ad9bf8b5dbb3d9a3e294\n"
    },
    {
      "commit": "d976c1c0675144b35f5bf9c7e3371c5e8aa75124",
      "tree": "2d9a653ab11cecec985680665b3c911049968c4d",
      "parents": [
        "6d813c2cac0714b34764fcddbd93771a0fefa829",
        "4dead6f3c81a8f21b71c7baedfe9cb73e112e167"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Jun 17 23:51:04 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jun 17 23:51:04 2016 +0000"
      },
      "message": "Merge \\\\\"MediaPlayer: disallow calling setPlaybackParams in stopped state.\\\\\" into nyc-mr1-dev am: 9ec10a72bf\nam: 4dead6f3c8\n\nChange-Id: I357634d2ef1013c38b2b26d779002692159d8d63\n"
    },
    {
      "commit": "4dead6f3c81a8f21b71c7baedfe9cb73e112e167",
      "tree": "c3b3cfe0e5d8acf5ca89103fdfc047f7515aa0c9",
      "parents": [
        "f0013688193c2e54889b6c6a665e581d7b369620",
        "9ec10a72bf56471a8afea7b8a7aaa705ef7d7cca"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Jun 17 23:36:14 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jun 17 23:36:14 2016 +0000"
      },
      "message": "Merge \\\"MediaPlayer: disallow calling setPlaybackParams in stopped state.\\\" into nyc-mr1-dev\nam: 9ec10a72bf\n\nChange-Id: I0a9497f8aa8c567579a53a59ae3c58848e6c4ccb\n"
    },
    {
      "commit": "5af6a9b4a6924377d80de7c3f460f99b89cff91e",
      "tree": "78b78152a8f8ecf03397bb14f4f6d6a02255f9b9",
      "parents": [
        "2dd124980b4d90daae60127eec56a88bda7e417b"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Jun 16 12:07:26 2016 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Jun 16 19:32:16 2016 +0000"
      },
      "message": "MediaPlayer: disallow calling setPlaybackParams in stopped state.\n\nBug: 29420829\nChange-Id: Iaba71f3b975022f150962fa306c2426c61457820\n"
    },
    {
      "commit": "c163ec57093faf73c5b0749b7644898b284f84c0",
      "tree": "767e69eddfd25106ece3619a27ead0011f82adb9",
      "parents": [
        "2c93595b5b62eec29aaf66300c9a6951ef9541b2",
        "ba505c621b565e815739180ee8e779077a85b3c1"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jun 14 22:21:31 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jun 14 22:21:31 2016 +0000"
      },
      "message": "Merge \\\\\"IMediaSource: add supportReadMultiple().\\\\\" into nyc-mr1-dev am: 5a71f1a211\nam: ba505c621b\n\nChange-Id: I25371f782242bba42addef9a9f672ec6fa4b1dfa\n"
    },
    {
      "commit": "ba505c621b565e815739180ee8e779077a85b3c1",
      "tree": "a253c18e30a8c02d5cab1f7a3dfa776e3a6c67ae",
      "parents": [
        "a590d49f700418080cfbef68a0334f90c1444b5d",
        "5a71f1a2117f769c1e26b77ccce9199a505c255f"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jun 14 21:58:41 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jun 14 21:58:41 2016 +0000"
      },
      "message": "Merge \\\"IMediaSource: add supportReadMultiple().\\\" into nyc-mr1-dev\nam: 5a71f1a211\n\nChange-Id: I41bdcc6f58ef96718acddd19c169b6e54fcc26a9\n"
    },
    {
      "commit": "d3f4e14d4c6ea02c49a50ad7c5fd08dd13b518e1",
      "tree": "f4d5f5976f5828787b3c2bd726b4fbea373a5201",
      "parents": [
        "2591f8308729b8f7b5d669d774cdac5636731535"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Mon Jun 13 14:51:43 2016 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jun 14 17:52:11 2016 +0000"
      },
      "message": "IMediaSource: add supportReadMultiple().\n\nBug: 29331573\nChange-Id: I7cdff44878bd93671e98fe11c99d17e82410cdcb\n"
    },
    {
      "commit": "10dbaa5876c0551adfc4c8a40842c5c7fdf39ff9",
      "tree": "ee2d001c5633c3e1a39c2f381427c2a23c97f94d",
      "parents": [
        "322f6d75bff35781f759324c404ddd2fac01c1a3",
        "bff1cd866fd81120540cc699c5d92092601e74d0"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Sat Jun 11 02:31:11 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sat Jun 11 02:31:11 2016 +0000"
      },
      "message": "Merge \\\\\\\"MediaPlayer: fix state for setPlaybackParams.\\\\\\\" into nyc-dev am: d554814b49 am: 2e96e62e24\nam: bff1cd866f\n\nChange-Id: I6f4372b19331bdff8f74b755890baaa6d85c6fe8\n"
    },
    {
      "commit": "bff1cd866fd81120540cc699c5d92092601e74d0",
      "tree": "ba23f8555c5350f6bac06c2e42910402565f8c77",
      "parents": [
        "94ef405a540c9b2dd523c3e55f2309c45b1606c9",
        "2e96e62e248b0019147e0de82d7984a1d832e2c7"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Sat Jun 11 02:27:31 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sat Jun 11 02:27:31 2016 +0000"
      },
      "message": "Merge \\\\\"MediaPlayer: fix state for setPlaybackParams.\\\\\" into nyc-dev am: d554814b49\nam: 2e96e62e24\n\nChange-Id: Ibf5b04a5eec5acd2837e50392ed172c405d03672\n"
    },
    {
      "commit": "2e96e62e248b0019147e0de82d7984a1d832e2c7",
      "tree": "eb1041254754da9b62f7a1d528ead3fb024a75d6",
      "parents": [
        "5f31e40cd5419046b88f94a6bf43697bfee03055",
        "d554814b49ae68a1e4a24f628bd0fed73a12ad08"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Sat Jun 11 02:23:20 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sat Jun 11 02:23:20 2016 +0000"
      },
      "message": "Merge \\\"MediaPlayer: fix state for setPlaybackParams.\\\" into nyc-dev\nam: d554814b49\n\nChange-Id: I370dc96e87250b20d5adaeb32f09df96c105d62d\n"
    },
    {
      "commit": "1978994a117f0bac69e7b17af6ffe1dc9e632272",
      "tree": "24250d2279052f2e77309b4ffdd51636d2a96614",
      "parents": [
        "129307bc8016de05778d4f904ad9aaa9610bb86e",
        "d554814b49ae68a1e4a24f628bd0fed73a12ad08"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Sat Jun 11 02:23:20 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sat Jun 11 02:23:20 2016 +0000"
      },
      "message": "Merge \\\"MediaPlayer: fix state for setPlaybackParams.\\\" into nyc-dev\nam: d554814b49\n\nChange-Id: I31d18ed997e8a9519e717bf1721a2a9407e33328\n"
    },
    {
      "commit": "d554814b49ae68a1e4a24f628bd0fed73a12ad08",
      "tree": "03ebd25273dd8aa6b0035d2dbe4d185010d708b5",
      "parents": [
        "008ae06c8ccc5d78c80e20f01b66ebba95c095c1",
        "5be109faadfc08b561221bd801082873b614b93d"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Sat Jun 11 02:16:58 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Sat Jun 11 02:16:58 2016 +0000"
      },
      "message": "Merge \"MediaPlayer: fix state for setPlaybackParams.\" into nyc-dev"
    },
    {
      "commit": "5be109faadfc08b561221bd801082873b614b93d",
      "tree": "7ee2c4c5f29c4b9bf280a18a9ed6b96d4d932427",
      "parents": [
        "f5be6e9364240fff6833ab7a69a913748796268d"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Jun 10 16:15:07 2016 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Jun 10 16:49:09 2016 -0700"
      },
      "message": "MediaPlayer: fix state for setPlaybackParams.\n\nBug: 29032949\nChange-Id: I7580a04cc03f96109a770f95abd3fb884c810103\n"
    },
    {
      "commit": "75b4830b14a67597692133988a2634cc933f8770",
      "tree": "ee9d0a25cee8ec3f545ad18ba8244bd6cf8bcb12",
      "parents": [
        "b746a8c7002a166dcc12f84cb5ca05d662ba52e5",
        "bd9895f125e17a2463b4f9cf99c0f227a76aa1e7"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Jun 10 16:25:05 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jun 10 16:25:05 2016 +0000"
      },
      "message": "Merge \\\\\\\"Don\\\\\\\u0027t use sp\u003c\u003e\u0026\\\\\\\" into nyc-dev am: 09b5fd9cbf am: 88b6c4d3d8\nam: bd9895f125\n\nChange-Id: Ia537d480e843ec1f6f4d513ad2c1fed0ff2f7e58\n"
    },
    {
      "commit": "bd9895f125e17a2463b4f9cf99c0f227a76aa1e7",
      "tree": "9531460f269ee63ce21f79d5ab7f5b621d5b2f66",
      "parents": [
        "b53212f3a3e73bc594f688c57f73ecd48c6b42e1",
        "88b6c4d3d87cb9c2fd8fc3d9761975b097302eaf"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Jun 10 16:22:18 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jun 10 16:22:18 2016 +0000"
      },
      "message": "Merge \\\\\"Don\\\\\u0027t use sp\u003c\u003e\u0026\\\\\" into nyc-dev am: 09b5fd9cbf\nam: 88b6c4d3d8\n\nChange-Id: I736f8066a2c2ee6ae63f3d6f66b485d3c2cbcb71\n"
    },
    {
      "commit": "88b6c4d3d87cb9c2fd8fc3d9761975b097302eaf",
      "tree": "c96f30bd42bb54ba80fdde3f8cd1e80c192fa7de",
      "parents": [
        "52edfe59ff31ba4acda76e00558638a0af9559d6",
        "09b5fd9cbfa3dd968ad1a5614afd1d538043a711"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Jun 10 16:19:27 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jun 10 16:19:27 2016 +0000"
      },
      "message": "Merge \\\"Don\\\u0027t use sp\u003c\u003e\u0026\\\" into nyc-dev\nam: 09b5fd9cbf\n\nChange-Id: Id2e6fc9f6a85ff1d17fd6225291858b5012dda32\n"
    },
    {
      "commit": "504e6adea003bc26688f0e84e58eb91feaa439ef",
      "tree": "a1d82fcce2c4173c484c35b494e1a279f15bbf6f",
      "parents": [
        "f9e1b9c3beb052756bc37559d17ac7d31425d3d9",
        "09b5fd9cbfa3dd968ad1a5614afd1d538043a711"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Jun 10 16:19:26 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jun 10 16:19:26 2016 +0000"
      },
      "message": "Merge \\\"Don\\\u0027t use sp\u003c\u003e\u0026\\\" into nyc-dev\nam: 09b5fd9cbf\n\nChange-Id: I45e45e8f550922ef86daee7febf0ee6e4f427e95\n"
    },
    {
      "commit": "fc908d010b32bbb850a6306893ce7db166a932f6",
      "tree": "7159c9a2686269fe5ac5d9f801bacbe3c5c0fb71",
      "parents": [
        "596e81bc4f32f8a205b4885c03b240b90e7ef090"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Tue Jun 07 12:26:43 2016 -0700"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Thu Jun 09 14:19:58 2016 -0700"
      },
      "message": "Don\u0027t use sp\u003c\u003e\u0026\n\nbecause they may end up pointing to NULL after a NULL check was performed.\n\nBug: 28166152\nChange-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe\n"
    },
    {
      "commit": "4cfa355eedae56e047b63b1b02fc6d789e21980d",
      "tree": "a45aeb0a86de3ecfb921666924ca3ea99cd79ce1",
      "parents": [
        "49a8a948be610444667ad98a816abe868bdb38d9",
        "b70868bb337f0b12f993494f4d110979a33ddd24"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Sat Jun 04 01:24:18 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sat Jun 04 01:24:18 2016 +0000"
      },
      "message": "Merge \"Add AudioTrack and AudioRecord flag checks\" into nyc-mr1-dev am: 2f8e63b5be\nam: b70868bb33\n\n* commit \u0027b70868bb337f0b12f993494f4d110979a33ddd24\u0027:\n  Add AudioTrack and AudioRecord flag checks\n\nChange-Id: Ia6ab9998dcaa065d18fc048ae5ea6bb3e087ba62\n"
    },
    {
      "commit": "b70868bb337f0b12f993494f4d110979a33ddd24",
      "tree": "bde43cc6ef3f51829fd1875013e0191ffa2b4915",
      "parents": [
        "fa877e53915259d8288fa6cf16d9ebe68d4a806d",
        "2f8e63b5be5b0160302cffe1f1f18e560d31d3e7"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Sat Jun 04 01:21:52 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sat Jun 04 01:21:52 2016 +0000"
      },
      "message": "Merge \"Add AudioTrack and AudioRecord flag checks\" into nyc-mr1-dev\nam: 2f8e63b5be\n\n* commit \u00272f8e63b5be5b0160302cffe1f1f18e560d31d3e7\u0027:\n  Add AudioTrack and AudioRecord flag checks\n\nChange-Id: If9043721f4763ce0f4db96c63595f92c5ba22556\n"
    },
    {
      "commit": "2f8e63b5be5b0160302cffe1f1f18e560d31d3e7",
      "tree": "ad5e2f3f7118b729de3bd238140c70dca2f145c0",
      "parents": [
        "725c7852e952f22edfc3c7d3fda67933cac56999",
        "050677873c10d4da308ac222f8533c96cca3207e"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Sat Jun 04 01:17:29 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Sat Jun 04 01:17:29 2016 +0000"
      },
      "message": "Merge \"Add AudioTrack and AudioRecord flag checks\" into nyc-mr1-dev"
    },
    {
      "commit": "050677873c10d4da308ac222f8533c96cca3207e",
      "tree": "fa2d3e91f74c5d838330f52cf158be8c774eec7f",
      "parents": [
        "53c87d5bb06a168290575099378bc7bfe1dca02b"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Jun 01 18:27:28 2016 -0700"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Fri Jun 03 16:46:38 2016 -0700"
      },
      "message": "Add AudioTrack and AudioRecord flag checks\n\nVerify that the requested flags are compatible with the input\nor output flags when creating and AudioRecord or AudioTrack\n\nGet rid of IAudioFlinger::track_flags_t which was redundant\nwith audio_input_flags_t and audio_output_flags_t.\n\nChange-Id: I0dd9232f857b2737e99a8c668806e45bce09cdbd\n"
    },
    {
      "commit": "6f293d93d203832e64283b9d2a887f2214d920a6",
      "tree": "d4ff478f6c713b4b4f1515b7b2cbb58df273938c",
      "parents": [
        "a8b1d04565a55760f0a3825bb650ccdd9676f270",
        "92505843f73008730a79388b7e8a646571f91e56"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Jun 03 17:43:49 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jun 03 17:43:49 2016 +0000"
      },
      "message": "Merge \"limit mediaextractor memory\" into nyc-dev am: 559b01b20a am: d5ce35aed9\nam: 92505843f7\n\n* commit \u002792505843f73008730a79388b7e8a646571f91e56\u0027:\n  limit mediaextractor memory\n\nChange-Id: I6248cd92242d0ca21e34aa155ff7d32e67e8bb9e\n"
    },
    {
      "commit": "d5ce35aed9ae96ee7f791b67f2d81fcc1ab81295",
      "tree": "afee6e18bdeaeb52eccf4cd1439dacd25d6b90c5",
      "parents": [
        "87aaf952004af6ae2b226202b3a24d63999b9aef",
        "559b01b20a18bce9017a199b93241690860fa0b7"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Jun 03 17:21:48 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jun 03 17:21:48 2016 +0000"
      },
      "message": "Merge \"limit mediaextractor memory\" into nyc-dev\nam: 559b01b20a\n\n* commit \u0027559b01b20a18bce9017a199b93241690860fa0b7\u0027:\n  limit mediaextractor memory\n\nChange-Id: I3921d30dcf8dd7449ddc3b4fd76fa186294ed8da\n"
    },
    {
      "commit": "c57fe21ebdd6813c5a8954f3fda51b82d26acd07",
      "tree": "0de87347d7a68d15856c89a70b6599ed959703ad",
      "parents": [
        "7d58810be46a86fa5c66d6d53d2453a5accc76f8"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Tue May 31 09:45:43 2016 -0700"
      },
      "committer": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Tue May 31 09:45:43 2016 -0700"
      },
      "message": "limit mediaextractor memory\n\nLimit mediaextractor using rlimit, to prevent it from bringing down the system\nvia the low memory killer.\n\nBug: 28471206\nBug: 28615448\nChange-Id: Ic84137435d1ef0a6883e9789a4b4f399e4283f05\n"
    },
    {
      "commit": "adcbf8f4c9ed345fa6665e934742dc9e11da3747",
      "tree": "facd341bbbebdcda9a7903af4f520334027e307f",
      "parents": [
        "d9adebb616746e764e1614d86739fb093eb833ca",
        "f897e4a66f814e653980271ab67d3605228c8bb5"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Fri May 27 20:38:00 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri May 27 20:38:00 2016 +0000"
      },
      "message": "resolve merge conflicts of 9764d52 to nyc-dev-plus-aosp am: 4c39b9c742\nam: f897e4a66f\n\n* commit \u0027f897e4a66f814e653980271ab67d3605228c8bb5\u0027:\n  Fix misc-macro-parentheses warnings.\n\nChange-Id: I104a6333d3bd74411731ffda425711853cb21d2f\n"
    },
    {
      "commit": "d9adebb616746e764e1614d86739fb093eb833ca",
      "tree": "7e90b0a3c01dde282be612d6941943aab611dd61",
      "parents": [
        "664ecd1e28bf8f397f4735d30cc288c9b6f80e72",
        "e0f8d0c69cbaafad8f4f62ef602994dd4eb63900"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Fri May 27 20:37:59 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri May 27 20:37:59 2016 +0000"
      },
      "message": "Merge \"Fix tone region(for US, CA and JP) recognition for dual SIM\" am: 5b326e16d5 am: f82e7a9149 am: f69feffd84\nam: e0f8d0c69c\n\n* commit \u0027e0f8d0c69cbaafad8f4f62ef602994dd4eb63900\u0027:\n  Fix tone region(for US, CA and JP) recognition for dual SIM\n\nChange-Id: I5fdb4b408a0b06161749b937350ea29cf16908e6\n"
    },
    {
      "commit": "4c39b9c74224782a6ceb299554f4abc9e1cf5733",
      "tree": "36615ae0cfaa565987875be2995d528d5445317f",
      "parents": [
        "f69feffd84bc736a8cdee7902bfcf988409af7c1",
        "9764d5292bcd936ff2442de69371913f88489189"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Fri May 27 11:38:26 2016 -0700"
      },
      "committer": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Fri May 27 11:38:26 2016 -0700"
      },
      "message": "resolve merge conflicts of 9764d52 to nyc-dev-plus-aosp\n\nChange-Id: I52d001d9dff4b250769e5fa59f9aea461b435193\n"
    },
    {
      "commit": "f69feffd84bc736a8cdee7902bfcf988409af7c1",
      "tree": "03148786918036d4c9b5206ba311dca31e615b30",
      "parents": [
        "714a433c874f8607b6bc7d127e4d83915259c74f",
        "f82e7a914967e78aae3a7f5f368a1404e8369b4a"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Fri May 27 17:57:30 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri May 27 17:57:30 2016 +0000"
      },
      "message": "Merge \"Fix tone region(for US, CA and JP) recognition for dual SIM\" am: 5b326e16d5\nam: f82e7a9149\n\n* commit \u0027f82e7a914967e78aae3a7f5f368a1404e8369b4a\u0027:\n  Fix tone region(for US, CA and JP) recognition for dual SIM\n\nChange-Id: I39341bf5ae0f86f22bee26ac57a6867dbb353f4a\n"
    },
    {
      "commit": "e0a6fa055310aac547882aef92c82276d04da9f1",
      "tree": "1ebfdb79711fb690d31ce10ae4c1f418ab175a07",
      "parents": [
        "5b326e16d5ff9705eac5e848465edc93c70750b7",
        "d6baf6f91afc194669fbffda83117ac2059eb04c"
      ],
      "author": {
        "name": "Chih-hung Hsieh",
        "email": "chh@google.com",
        "time": "Fri May 27 17:54:05 2016 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Fri May 27 17:54:05 2016 +0000"
      },
      "message": "Merge \"Fix misc-macro-parentheses warnings.\""
    },
    {
      "commit": "5b326e16d5ff9705eac5e848465edc93c70750b7",
      "tree": "6431610a0f51a1e21f33ff4728a094a5e33eee40",
      "parents": [
        "3156b5dc70fe80eb513ae6fabbcabec186cc923c",
        "0bc9277c965d3cf5228c71c7ce0dc7f48975f20d"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Fri May 27 17:45:50 2016 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Fri May 27 17:45:50 2016 +0000"
      },
      "message": "Merge \"Fix tone region(for US, CA and JP) recognition for dual SIM\""
    },
    {
      "commit": "0bc9277c965d3cf5228c71c7ce0dc7f48975f20d",
      "tree": "43715401e48e181974c1a1e8b483b1e7a748e2ae",
      "parents": [
        "e7d3c72f23384774407248edcbfc9c9d78bfe304"
      ],
      "author": {
        "name": "tadashi.aoyama",
        "email": "tadashi.xa.aoyama@sonymobile.com",
        "time": "Mon Apr 18 18:30:46 2016 +0900"
      },
      "committer": {
        "name": "Takahiro Aizawa",
        "email": "takahiro.aizawa@sonymobile.com",
        "time": "Fri May 27 19:19:04 2016 +0900"
      },
      "message": "Fix tone region(for US, CA and JP) recognition for dual SIM\n\nValue of \"gsm.operator.iso-country\" differs between the case of single\nSIM device and the case of dual SIM device with only one SIM enabled.\nThis change makes ToneGenerator detect region in case there is only\none SIM enabled in dual SIM device.\n\nChange-Id: I771858ec9d85054d90d7d8141266655b42b093b9\n"
    },
    {
      "commit": "0ccaca151cd666de6eb1140fdf330d6cca1cf9a3",
      "tree": "10079841993f8cf178e7f1a732e95589857ef97b",
      "parents": [
        "aabb9da5dcc09939f7f7a2a968f2d5cbcc80fbc2",
        "c26f645ffd66a2f268334c6527b3e7bd5217cf7b"
      ],
      "author": {
        "name": "Chih-hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed May 25 19:42:46 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 25 19:42:46 2016 +0000"
      },
      "message": "Merge \"Merge \"Fix misc-macro-parentheses warnings.\" am: 945da9bbcd am: b3db6b8c3e\" into nyc-dev-plus-aosp am: ae46b50c57\nam: c26f645ffd\n\n* commit \u0027c26f645ffd66a2f268334c6527b3e7bd5217cf7b\u0027:\n  Fix misc-macro-parentheses warnings.\n\nChange-Id: I4b95492d54c81c261b243a4bb72195fa589ae665\n"
    },
    {
      "commit": "8a4348bb7a598eab9b692d782595689112df367a",
      "tree": "68330027ea8dc0ca59ddeeba091eada0c39803dc",
      "parents": [
        "96e9bfd9b9f80c10e27667e2590aa07c4d7757d0",
        "6b0a8693e169a97f5fd92260bcbd437b514d7691"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed May 25 19:42:39 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 25 19:42:39 2016 +0000"
      },
      "message": "resolve merge conflicts of 5d8e380 to nyc-mr1-dev am: b09a6d0832\nam: 6b0a8693e1\n\n* commit \u00276b0a8693e169a97f5fd92260bcbd437b514d7691\u0027:\n  AudioTrack: Fix timestamp startup condition\n\nChange-Id: Ie11abf463d4ca8b065fffc66bfb1c4db37a3ca4c\n"
    },
    {
      "commit": "6b0a8693e169a97f5fd92260bcbd437b514d7691",
      "tree": "e66adddcd25634631a49bc08b404702654b4f278",
      "parents": [
        "6a0ed5ca8434b65a3fe8bf4a5f13a230e0e8502c",
        "b09a6d08321b9484d80a2a9dc11ed52623942c8d"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed May 25 19:34:10 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 25 19:34:10 2016 +0000"
      },
      "message": "resolve merge conflicts of 5d8e380 to nyc-mr1-dev\nam: b09a6d0832\n\n* commit \u0027b09a6d08321b9484d80a2a9dc11ed52623942c8d\u0027:\n  AudioTrack: Fix timestamp startup condition\n\nChange-Id: Id2c883949a47daac936266310ebe4d69a5965eb3\n"
    },
    {
      "commit": "ae46b50c57ac3386d9c8eec00eacc6b60bb2bd1a",
      "tree": "e8ceebca76a2b0814a3c13584274c134b2b54d45",
      "parents": [
        "8572ee135c9af5aacf74f02dd3ce8e9eb3956ec4",
        "688d14a492a16a82e55f654bc2ca66ce50ebf715"
      ],
      "author": {
        "name": "Android Build Merger (Role)",
        "email": "android-build-merger@google.com",
        "time": "Wed May 25 18:30:31 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 25 18:30:32 2016 +0000"
      },
      "message": "Merge \"Merge \"Fix misc-macro-parentheses warnings.\" am: 945da9bbcd am: b3db6b8c3e\" into nyc-dev-plus-aosp"
    },
    {
      "commit": "688d14a492a16a82e55f654bc2ca66ce50ebf715",
      "tree": "9b40a0db6a0b7194a2493c8242934e9b46924ccb",
      "parents": [
        "394040d4377e375477e30496f2ae01dcd9f59eeb",
        "b3db6b8c3e04337ec3b122a106f89d4691009bd9"
      ],
      "author": {
        "name": "Chih-hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed May 25 18:30:20 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 25 18:30:20 2016 +0000"
      },
      "message": "Merge \"Fix misc-macro-parentheses warnings.\" am: 945da9bbcd\nam: b3db6b8c3e\n\n* commit \u0027b3db6b8c3e04337ec3b122a106f89d4691009bd9\u0027:\n  Fix misc-macro-parentheses warnings.\n\nChange-Id: Ief489e128b5b77e3fed5878ce042b2325b7848bc\n"
    },
    {
      "commit": "8572ee135c9af5aacf74f02dd3ce8e9eb3956ec4",
      "tree": "f48f156b0b3dbeccf126359e45c729dc12c874b5",
      "parents": [
        "2e75c84b7a95eceefbc00f9533e31eef983ec014",
        "5d8e3808b4012fa72bedf5898803682831f88e84"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Wed May 25 18:29:54 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 25 18:29:54 2016 +0000"
      },
      "message": "Merge \"AudioTrack: Fix timestamp startup condition\" into nyc-dev\nam: 5d8e3808b4\n\n* commit \u00275d8e3808b4012fa72bedf5898803682831f88e84\u0027:\n  AudioTrack: Fix timestamp startup condition\n\nChange-Id: Ibc54738fb4beee0db7559e5b9f76910d639e966f\n"
    },
    {
      "commit": "69488c4ef115c9de52c85f4fcae27c7774720298",
      "tree": "9f1be0c3a13dec3768aa3e314f346afa7aa96ff0",
      "parents": [
        "f3d9908a888203e7e70b8c2d43ee741a95e154ed"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Mon May 16 18:43:33 2016 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue May 24 18:59:42 2016 -0700"
      },
      "message": "AudioTrack: Fix timestamp startup condition\n\nSuppress timestamps without valid kernel information or\na server update.\n\nUpdate timing of server timestamp location to better indicate\nwhen the server pull occurs.\n\nUpdate write timing logic to suppress unneeded time calls\nand to ensure proper throttling.\n\nBug: 28771691\nChange-Id: I2cd25dad638ca1d0b1355d87d175d908f3bddb26\n"
    },
    {
      "commit": "f797c3a3de15563ed1a66f067689b8717f724831",
      "tree": "5350a135166121cb8f95490c5c9135e80b4bd738",
      "parents": [
        "791fce20ee88597ea7cd64cc728010088a2e7a8f",
        "e34a44ff6cb12e65736c09e1baab1823de190e03"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue May 24 20:54:47 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue May 24 20:54:47 2016 +0000"
      },
      "message": "Merge \"Add memory heap checks for mediaserver and audioserver\" into nyc-dev am: f3d9908a88 am: ce2b51c91f\nam: e34a44ff6c\n\n* commit \u0027e34a44ff6cb12e65736c09e1baab1823de190e03\u0027:\n  Add memory heap checks for mediaserver and audioserver\n\nChange-Id: I7176f6a4d3d27343e7ac5bb22a476e4e3076ed17\n"
    },
    {
      "commit": "e34a44ff6cb12e65736c09e1baab1823de190e03",
      "tree": "fd6027a086dc6e2f4cd4dacb5cd9b7317a78f3e4",
      "parents": [
        "a15b56e48406d8242e91629e748a1b90d5977381",
        "ce2b51c91f431be6a62b2fed746650d18499cb83"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue May 24 20:46:52 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue May 24 20:46:52 2016 +0000"
      },
      "message": "Merge \"Add memory heap checks for mediaserver and audioserver\" into nyc-dev am: f3d9908a88\nam: ce2b51c91f\n\n* commit \u0027ce2b51c91f431be6a62b2fed746650d18499cb83\u0027:\n  Add memory heap checks for mediaserver and audioserver\n\nChange-Id: If5a9216ef18a9af22154d1510f835e0b3fafa651\n"
    },
    {
      "commit": "5cb96b83e6bff91a5ab006ff542dc32031be9087",
      "tree": "94fee5c9f5cb6130a87d0e4cecbae27dd5abd2be",
      "parents": [
        "4d1522bdc7efaa9677ac92b620cea9e9110ec2a4",
        "f3d9908a888203e7e70b8c2d43ee741a95e154ed"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue May 24 20:41:03 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue May 24 20:41:03 2016 +0000"
      },
      "message": "Merge \"Add memory heap checks for mediaserver and audioserver\" into nyc-dev\nam: f3d9908a88\n\n* commit \u0027f3d9908a888203e7e70b8c2d43ee741a95e154ed\u0027:\n  Add memory heap checks for mediaserver and audioserver\n\nChange-Id: I8b5dda2e29da8651cbd9dbc77fa9ca6211b1a47d\n"
    },
    {
      "commit": "f3d9908a888203e7e70b8c2d43ee741a95e154ed",
      "tree": "d19638ca4ece2ea0f7f60c851b7970b6d4178ba4",
      "parents": [
        "b2379ba0a32638bae2ea0460644f68cf5a0967ce",
        "07b745e166ee62030960ccea37e117caadf71c32"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Tue May 24 20:38:23 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue May 24 20:38:23 2016 +0000"
      },
      "message": "Merge \"Add memory heap checks for mediaserver and audioserver\" into nyc-dev"
    },
    {
      "commit": "7118308943d64f8d9e4c63b0e6d49da376be1966",
      "tree": "fbee0420bd4c801ec8e834bed6e05a8de8837944",
      "parents": [
        "d9bb4b4e2ecc8fd0002249b73a23973208d74786",
        "e52cab1f56c39b72090f53ef3b2a187191d13143"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue May 24 17:54:19 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue May 24 17:54:19 2016 +0000"
      },
      "message": "Fix android.permission.CAPTURE_AUDIO_OUTPUT permission check am: b2379ba0a3 am: cc516cdd02\nam: e52cab1f56\n\n* commit \u0027e52cab1f56c39b72090f53ef3b2a187191d13143\u0027:\n  Fix android.permission.CAPTURE_AUDIO_OUTPUT permission check\n\nChange-Id: Ia663aa8d975108cda5f0f2592d4bbf490bf776da\n"
    },
    {
      "commit": "d9bb4b4e2ecc8fd0002249b73a23973208d74786",
      "tree": "479eb6f2bf311a886dcd5a60381f408d3c2fc862",
      "parents": [
        "52bec5b2657467a29989c9aff1962dacd4bbb682",
        "a76c33e1bfc73baa190627cb9862b7789ddf8232"
      ],
      "author": {
        "name": "Haynes Mathew George",
        "email": "hgeorge@codeaurora.org",
        "time": "Tue May 24 17:54:11 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue May 24 17:54:11 2016 +0000"
      },
      "message": "Merge \"audioflinger: Pass pid of process creating track or opening record\" into nyc-dev am: a0e10ff02b am: 8b269a1708\nam: a76c33e1bf\n\n* commit \u0027a76c33e1bfc73baa190627cb9862b7789ddf8232\u0027:\n  audioflinger: Pass pid of process creating track or opening record\n\nChange-Id: I6b9bf80afa039c16862c2979ff58a1592c1a02ff\n"
    },
    {
      "commit": "cc516cdd0293fead98ed33fa0334c79a940c8653",
      "tree": "fa6c111b9856952a99c3975ef72acb547d261d87",
      "parents": [
        "8b269a1708b95d5f31ea59afb36bb42c26f91961",
        "b2379ba0a32638bae2ea0460644f68cf5a0967ce"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue May 24 17:27:15 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue May 24 17:27:15 2016 +0000"
      },
      "message": "Fix android.permission.CAPTURE_AUDIO_OUTPUT permission check\nam: b2379ba0a3\n\n* commit \u0027b2379ba0a32638bae2ea0460644f68cf5a0967ce\u0027:\n  Fix android.permission.CAPTURE_AUDIO_OUTPUT permission check\n\nChange-Id: Iff08e0b44c71b63d101ca26c6ed9972fa030bfb1\n"
    },
    {
      "commit": "8b269a1708b95d5f31ea59afb36bb42c26f91961",
      "tree": "26bed40714d9c75ae6e843c36299b6836c4ef938",
      "parents": [
        "4fce50b0b30d583909cef1610957bf33a3aa3ac7",
        "a0e10ff02b156738c0e5441104821b220eea3d68"
      ],
      "author": {
        "name": "Haynes Mathew George",
        "email": "hgeorge@codeaurora.org",
        "time": "Tue May 24 17:27:05 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue May 24 17:27:05 2016 +0000"
      },
      "message": "Merge \"audioflinger: Pass pid of process creating track or opening record\" into nyc-dev\nam: a0e10ff02b\n\n* commit \u0027a0e10ff02b156738c0e5441104821b220eea3d68\u0027:\n  audioflinger: Pass pid of process creating track or opening record\n\nChange-Id: I728ffba8938a82f8b8f7b773febafd5e466c8e4d\n"
    },
    {
      "commit": "b2379ba0a32638bae2ea0460644f68cf5a0967ce",
      "tree": "92313531455a4482d97d03d0f4ecb1e727b4076a",
      "parents": [
        "a0e10ff02b156738c0e5441104821b220eea3d68"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon May 23 17:42:12 2016 -0700"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue May 24 17:16:57 2016 +0000"
      },
      "message": "Fix android.permission.CAPTURE_AUDIO_OUTPUT permission check\n\nMake sure we use the correct PID and UID when checking\nandroid.permission.CAPTURE_AUDIO_OUTPUT permission from audio\npolicy service.\n\nBug: 28772898\nChange-Id: I8f0c45bf7a5728b4364a451eefb6c025892ae9a5\n"
    },
    {
      "commit": "9ea77cdba8c422940adb57a790b44ac04fe0353f",
      "tree": "1e7c588ce1add16e6991eaae918d38414b17d879",
      "parents": [
        "f0f4f1e494a80ce300a68cfce0e1dc627c09c29a"
      ],
      "author": {
        "name": "Haynes Mathew George",
        "email": "hgeorge@codeaurora.org",
        "time": "Wed Apr 06 17:07:48 2016 -0700"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue May 24 00:48:20 2016 +0000"
      },
      "message": "audioflinger: Pass pid of process creating track or opening record\n\nAudioFlinger allocates a Client heap for each unique pid.\nIf two applications use mediaplayer APIs, the same Client heap\nis reused as the pid used is not the application pid but that\nof mediaserver. With this change, the pid of the application\npid is used to decide the heap to be used.\n\nBug: 23525542\nBug: 28772898\nChange-Id: I31a695b0b321eff6e2aca80c3bc4aeb3e1cd9ac7\n"
    },
    {
      "commit": "07b745e166ee62030960ccea37e117caadf71c32",
      "tree": "a370227e0d195f58a4e7797d8a70933730970907",
      "parents": [
        "d4c4d2248bdfd06dc7b23dd2d81541d3941f8bf9"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Mon May 23 16:21:07 2016 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Mon May 23 16:55:08 2016 -0700"
      },
      "message": "Add memory heap checks for mediaserver and audioserver\n\nMemory heap check updated and restored to mediaserver,\nadded as new option to audioserver.\n\nRequires properties to be set (example for audioserver):\n\n$ adb shell setprop libc.debug.malloc.program audioserver\n$ adb shell setprop libc.debug.malloc.options backtrace\u003d8\n$ adb shell pkill audioserver\n\n...\n\nand to dump:\n\n$ adb shell dumpsys media.audio_flinger -m\n\nBug: 28909124\nBug: 27500825\nChange-Id: Ifa8c2c02b022daf1a799ee4a1d75282a3c921763\n"
    },
    {
      "commit": "4183d539fd9528d79d2c740769d01233b19017a1",
      "tree": "16cb45c31a56e8325c092d469c21d15517a54b6d",
      "parents": [
        "d5c8642dfba7e6465582701756f2c161aa14d9a3"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri May 20 17:19:31 2016 -0700"
      },
      "committer": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri May 20 17:30:03 2016 -0700"
      },
      "message": "Fix Security Vulnerability in mediaserver\n\nCrash on new CryptoPlugin::SubSample[].  numSubSamples\nwasn\u0027t sanity checked, a malicious caller could pass\na very large number of subsamples causing the new\noperator to fail which would crash the server process.\nAdd a sanity check to numSubSamples, which is defined\nby the ISO-BMFF spec to be represented as unsigned 16\nbits.\n\nbug: 23718580\nChange-Id: I36e18e60f2515289d1873640a3408c01e40a1174\n"
    },
    {
      "commit": "d6baf6f91afc194669fbffda83117ac2059eb04c",
      "tree": "f717fe8ce0f3c6e8369b14256b89de5a198e4329",
      "parents": [
        "0603c5dfc34923095218307674a60429bfa5873a"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Tue May 17 15:28:38 2016 -0700"
      },
      "committer": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Tue May 17 15:28:38 2016 -0700"
      },
      "message": "Fix misc-macro-parentheses warnings.\n\nBug: 28705665\nChange-Id: I51f09c5d6537b864a53db891ba5f86cf6c195dac\n"
    },
    {
      "commit": "83fbbb8f8705445a4d4a9532d17690098f36f50f",
      "tree": "793fdbb39ea6d885df1bf6ac48dc50a94377b9aa",
      "parents": [
        "0603c5dfc34923095218307674a60429bfa5873a"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Tue May 17 15:08:10 2016 -0700"
      },
      "committer": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Tue May 17 15:08:10 2016 -0700"
      },
      "message": "Fix misc-macro-parentheses warnings.\n\nBug: 28705665\nChange-Id: Ia4c2ab619f62648aa1f0c84b7264fee07ddbe9ac\n"
    }
  ],
  "next": "c36c44171dcd984f42c2c38372555b8076126476"
}
