)]}'
{
  "log": [
    {
      "commit": "74b56a8e0d5c4aabd7df4d79589f93b23d8fae89",
      "tree": "251c3e91620288d90df91b6c1d507e5a34d954e6",
      "parents": [
        "45b663eae82282098d8c21c792a06c4f9f61da31",
        "168e16423f7bfa0387543df52697814ef160cce9"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Mon Aug 22 19:42:26 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Aug 22 19:42:26 2016 +0000"
      },
      "message": "resolve merge conflicts of 77da968 to nyc-dev-plus-aosp\nam: 168e16423f\n\nChange-Id: I72e14cf6b3affce16e910218196609aee4ff9845\n"
    },
    {
      "commit": "168e16423f7bfa0387543df52697814ef160cce9",
      "tree": "5b7a2e5385e7d0b9d1e59335dd32ffc3615246c5",
      "parents": [
        "776229a34a5f6f2c8dd2d67987624cacb362cbb7",
        "77da9683de33028a0b277667a0698e8eb1c8c7bc"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Mon Aug 22 12:27:15 2016 -0700"
      },
      "committer": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Mon Aug 22 12:27:34 2016 -0700"
      },
      "message": "resolve merge conflicts of 77da968 to nyc-dev-plus-aosp\n\nChange-Id: I123956fe0f90e7fc7712cf5a99b29add94d15564\n"
    },
    {
      "commit": "77da9683de33028a0b277667a0698e8eb1c8c7bc",
      "tree": "2b2c7589065bf2dc4bd9a4efe765f8ea91e455a9",
      "parents": [
        "167bfc2bae3e29e1332b23cb35c188db9e0837c2",
        "17744ab9d700078d1268dab2a070e6ef8cf962ec"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Mon Aug 22 18:48:21 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Aug 22 18:48:21 2016 +0000"
      },
      "message": "MediaPlayerService: avoid invalid static cast am: ee0a0e39ac am: 7b6a85546c am: b07255f603 am: d560830823 am: 51efd24460 am: 8d32201d4a am: 2b5ee9c8e4\nam: 17744ab9d7\n\nChange-Id: I7c9bff5b79002b4c1e83437b69c8cfd5a09854a3\n"
    },
    {
      "commit": "2b5ee9c8e4e7cd3ceadeb03fb68f217a4629de6d",
      "tree": "1127ac15fddbf89e6b8c124d7312d4442f01ec37",
      "parents": [
        "d4808afb993aafccd294aeff5cf6cee46d681367",
        "8d32201d4a6caa7983ae002a76d69d511a804e0a"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Mon Aug 22 18:36:19 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Aug 22 18:36:19 2016 +0000"
      },
      "message": "MediaPlayerService: avoid invalid static cast am: ee0a0e39ac am: 7b6a85546c am: b07255f603 am: d560830823 am: 51efd24460\nam: 8d32201d4a\n\nChange-Id: I995c3d8e87f78596c7e3007f2b0a269542adfd42\n"
    },
    {
      "commit": "8d32201d4a6caa7983ae002a76d69d511a804e0a",
      "tree": "ae2f8bf640c4b66b7e645e9462ab34037d790e8b",
      "parents": [
        "38795159877868a41eb453bc79ef89f0538a25a3",
        "51efd2446058bfe0b6ecdd1858bd759159fd0831"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Mon Aug 22 18:32:19 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Aug 22 18:32:19 2016 +0000"
      },
      "message": "MediaPlayerService: avoid invalid static cast am: ee0a0e39ac am: 7b6a85546c am: b07255f603 am: d560830823\nam: 51efd24460\n\nChange-Id: I77f1705ddb125b7eb1c1f6b6e8cb61fb0596d2e2\n"
    },
    {
      "commit": "51efd2446058bfe0b6ecdd1858bd759159fd0831",
      "tree": "43dfd3a2e8ff065c81a7c12d289d0788afbb686e",
      "parents": [
        "be78a1c73f20bd72a3747b0c2552ae234b4e49be",
        "d560830823619a753be997d11d4f38223e74724e"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Mon Aug 22 18:28:19 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Aug 22 18:28:19 2016 +0000"
      },
      "message": "MediaPlayerService: avoid invalid static cast am: ee0a0e39ac am: 7b6a85546c am: b07255f603\nam: d560830823\n\nChange-Id: I77a7c93a2ae554532accb3be47bdee687b99f271\n"
    },
    {
      "commit": "d560830823619a753be997d11d4f38223e74724e",
      "tree": "7d11f31236516c4c2da1ab1dfb3cd0f102fb553c",
      "parents": [
        "6b1403777e71af2f342ed8a279197e8149aae164",
        "b07255f6038c7c7b9a80c9fe2bd2c5d7bbe0c8f1"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Mon Aug 22 18:23:41 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Aug 22 18:23:41 2016 +0000"
      },
      "message": "MediaPlayerService: avoid invalid static cast am: ee0a0e39ac am: 7b6a85546c\nam: b07255f603\n\nChange-Id: I9e2b7d8166c629fdbc3457d152e2947f16ba7ae3\n"
    },
    {
      "commit": "7b6a85546c9e320f62b1b4cda9d6620b4e34acc5",
      "tree": "6c0cf42e31a09cab675024ff2ae44cadf791ecb3",
      "parents": [
        "d9591024204ac4174a9e59759fc29f374b65a9eb",
        "ee0a0e39acdcf8f97e0d6945c31ff36a06a36e9d"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Mon Aug 22 18:12:48 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Aug 22 18:12:48 2016 +0000"
      },
      "message": "MediaPlayerService: avoid invalid static cast\nam: ee0a0e39ac\n\nChange-Id: I2e857a57fe87c5050b1042d27c8e3034df2a462c\n"
    },
    {
      "commit": "f5a40c689555e845dd79184810355e5307f23e01",
      "tree": "af8e67a456cb945e8f3f3bb2135a275b9c8e8a89",
      "parents": [
        "daa5dafca558aab3b46204fcee630e3a40ba4823",
        "5fe669bafa0b553003880a8c786eadd7d5f00b4a"
      ],
      "author": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Fri Aug 19 16:44:11 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Aug 19 16:44:11 2016 +0000"
      },
      "message": "mediarecorder: fix timestamp adjustment for early pause/resume am: a5aeb87eab\nam: 5fe669bafa\n\nChange-Id: I974f0099a03d7a783aeebbb514b7936f11caa463\n"
    },
    {
      "commit": "a5aeb87eabfda3cb385eed405b843bdcb64252be",
      "tree": "57da7b8e5369939413889c1168cae49d17a74dc2",
      "parents": [
        "e35600eb62d4a2dc2dd0cc8c0d0d177cec7ed1cc"
      ],
      "author": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Fri Jul 29 16:51:48 2016 +0900"
      },
      "committer": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Thu Aug 18 16:41:05 2016 +0900"
      },
      "message": "mediarecorder: fix timestamp adjustment for early pause/resume\n\nBug: 30549032\nChange-Id: Iafb916454499e9fac3af3b8a6abe06c652f84564\n"
    },
    {
      "commit": "ee0a0e39acdcf8f97e0d6945c31ff36a06a36e9d",
      "tree": "e2cd58cba0269f63036fbf85b2182f9f04771289",
      "parents": [
        "8f4b1a7de0e102b9203cfda3970edd2eedd9becf"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Tue Aug 16 16:50:54 2016 -0700"
      },
      "committer": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Tue Aug 16 17:13:47 2016 -0700"
      },
      "message": "MediaPlayerService: avoid invalid static cast\n\nBug: 30204103\nChange-Id: Ie0dd3568a375f1e9fed8615ad3d85184bcc99028\n"
    },
    {
      "commit": "d97e14c1c20e3763f2e91e55da3255b55448cbfd",
      "tree": "9601dab340035c460e61a7cf46029b608104eda2",
      "parents": [
        "61afde48bcc6dfd59643ee091b9cffd309f0e61f",
        "775226f35d49d6d71c144bd398cea763ad62bd28"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Mon Aug 15 21:33:29 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Aug 15 21:33:29 2016 +0000"
      },
      "message": "stagefright: handle NULL format after convertMetaDataToMessage am: 5bd99f9211\nam: 775226f35d\n\nChange-Id: I670fb7014f929c90d2f1d274fb0f6021730c945d\n"
    },
    {
      "commit": "7d64d30d0dcdb97be921790e2702e5adfe751d92",
      "tree": "440252f501c141fe4416dfc58898edce7e41681d",
      "parents": [
        "81b0d510e8ab71649aa7478d722ebb0d99cab8d9",
        "a944197b97b4e64ffb3abe91218d1db06ea9d7de"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Fri Aug 12 21:33:07 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Aug 12 21:33:07 2016 +0000"
      },
      "message": "resolve merge conflicts of 6ae8c7b to stage-aosp-master am: 32d6e5f0eb\nam: a944197b97\n\nChange-Id: I03472be260cbfdaf436514d319e91063c738b82c\n"
    },
    {
      "commit": "a944197b97b4e64ffb3abe91218d1db06ea9d7de",
      "tree": "10605cfea223bd40c6841fe4d36769567d2504fc",
      "parents": [
        "b29fdbe4467335c3d277ffc3433c7cb5ef8be4ec",
        "32d6e5f0ebe9e00f80401e5f4fd6e285a474590d"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Fri Aug 12 21:28:50 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Aug 12 21:28:50 2016 +0000"
      },
      "message": "resolve merge conflicts of 6ae8c7b to stage-aosp-master\nam: 32d6e5f0eb\n\nChange-Id: I200068e27004c5f3c9508a4f46747e0459b31ba8\n"
    },
    {
      "commit": "32d6e5f0ebe9e00f80401e5f4fd6e285a474590d",
      "tree": "3bdd56b0b9b65ec35caa4a976c76ad9d4214cfbd",
      "parents": [
        "311f99eade1222575bc65a2fcbd9f9a5a40d2024",
        "6ae8c7bc1fd68dc810155df7021fde26a2b2414c"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Fri Aug 12 13:46:48 2016 -0700"
      },
      "committer": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Fri Aug 12 13:53:20 2016 -0700"
      },
      "message": "resolve merge conflicts of 6ae8c7b to stage-aosp-master\n\nChange-Id: Iabb5d9b93b98e428c53f0504fbfe832ed24d988d\n"
    },
    {
      "commit": "6ae8c7bc1fd68dc810155df7021fde26a2b2414c",
      "tree": "e333d0aaffb4a0c017f4e63ab6c64a3ab31cd4c3",
      "parents": [
        "70066d92606c66dedd27c974a7ee6f84e36ef015",
        "0d1ed381fde5dac12dd84fcf3da66dac46699378"
      ],
      "author": {
        "name": "Chih-hung Hsieh",
        "email": "chh@google.com",
        "time": "Fri Aug 12 20:34:15 2016 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Fri Aug 12 20:34:15 2016 +0000"
      },
      "message": "Merge \"Fix clang-tidy warnings in stagefright.\""
    },
    {
      "commit": "5ca8f32280377dd923e72c3c6bd3994217461b8b",
      "tree": "b5146ce7885539d8b002d3270346f574e3965711",
      "parents": [
        "7aeb8c8d4437eb8f45be3ad3828764795e14ad4c",
        "63ef5a38f82d22c1f97922fe490a1fd336566d5c"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed Aug 10 23:53:01 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Aug 10 23:53:01 2016 +0000"
      },
      "message": "resolve merge conflicts of fd923e7 to stage-aosp-master am: df5d9246f9\nam: 63ef5a38f8\n\nChange-Id: I516a43c5e56323e99ad7a8ca2e4811b77c9704f4\n"
    },
    {
      "commit": "63ef5a38f82d22c1f97922fe490a1fd336566d5c",
      "tree": "e84028568dbcede5ffdaf58be20c6cc080028edd",
      "parents": [
        "b8750e114b6fd99768c45233d4b2ffb2b198f5d1",
        "df5d9246f9607b1c2f8b134c46a05af06e206da3"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed Aug 10 23:50:01 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Aug 10 23:50:01 2016 +0000"
      },
      "message": "resolve merge conflicts of fd923e7 to stage-aosp-master\nam: df5d9246f9\n\nChange-Id: I20767244fef48ad42334c5131e2d402f75bb7327\n"
    },
    {
      "commit": "df5d9246f9607b1c2f8b134c46a05af06e206da3",
      "tree": "7cd9fcb42c86c8cfe950db239e21e8b5ece98369",
      "parents": [
        "7ad2854adc0abe8dd7909a6ed401107ad09bc3d2",
        "fd923e7fe2779bcd69d79471b8c30c8b98918f62"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed Aug 10 15:40:39 2016 -0700"
      },
      "committer": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed Aug 10 16:10:32 2016 -0700"
      },
      "message": "resolve merge conflicts of fd923e7 to stage-aosp-master\n\nChange-Id: I75b44b89bae41197a1fd68362d20b8ba2b4dd192\n"
    },
    {
      "commit": "fd923e7fe2779bcd69d79471b8c30c8b98918f62",
      "tree": "216eef7ee3c7dd3658bf6a97bdf93e5b46c9990f",
      "parents": [
        "1c10de5b7bafaa7886bf6c9f61d435aeb2b1e7f4",
        "36d0ca16024820df9a12903d2ac443fabcc180bc"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed Aug 10 22:17:25 2016 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Aug 10 22:17:25 2016 +0000"
      },
      "message": "Merge \"Fix clang-tidy warnings in audio and playerservice.\""
    },
    {
      "commit": "36d0ca16024820df9a12903d2ac443fabcc180bc",
      "tree": "51e8f285ae66ad7cb922caeb7ba8d5f1d20367e3",
      "parents": [
        "67fbddfdc2cafd63c83d3bb55a2451d4c26f546d"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Tue Aug 09 14:31:32 2016 -0700"
      },
      "committer": {
        "name": "Chih-hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed Aug 10 17:56:35 2016 +0000"
      },
      "message": "Fix clang-tidy warnings in audio and playerservice.\n\n* Add explicit keyword to conversion constructors.\nBug: 28341362\n* Use const reference type for read-only parameters.\nBug: 30407689\nTest: build with WITH_TIDY\u003d1\n\nChange-Id: I265f3b094e08d5705b506b3fbba51439c134af84\nMerged-In: I265f3b094e08d5705b506b3fbba51439c134af84\n"
    },
    {
      "commit": "0d1ed381fde5dac12dd84fcf3da66dac46699378",
      "tree": "cf0367b8e296171a61d16924bb26a4f84db57700",
      "parents": [
        "67fbddfdc2cafd63c83d3bb55a2451d4c26f546d"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Tue Aug 09 14:28:14 2016 -0700"
      },
      "committer": {
        "name": "Chih-hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed Aug 10 17:38:12 2016 +0000"
      },
      "message": "Fix clang-tidy warnings in stagefright.\n\n* Add explicit keyword to conversion constructors.\n* Or add NOLINT to implicit conversion constructors.\nBug: 28341362\n* Use const reference type for read-only parameters.\nBug: 30407689\n* Use const reference type to avoid unnecessary copy.\nBug: 30413862\nTest: build with WITH_TIDY\u003d1\n\nChange-Id: I7a15ac1e37973fe2c661f577a6106b913653de40\nMerged-In: I7a15ac1e37973fe2c661f577a6106b913653de40\n"
    },
    {
      "commit": "5bd99f9211c533058be9f41bc966be1f2f501f13",
      "tree": "a9ff7de7295ba1b20672afa0a6d91b644b299c83",
      "parents": [
        "eb2c7c372615427b3b6350f1f563382b0b70917e"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Aug 10 10:30:07 2016 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Aug 10 10:31:39 2016 -0700"
      },
      "message": "stagefright: handle NULL format after convertMetaDataToMessage\n\nBug: 30421366\nChange-Id: I411f9f22b39943f7c8fa4e22fc37efe5f9e0ccb5\n"
    },
    {
      "commit": "8c0164ca98bcc76f3656fb1078033bffd4a387de",
      "tree": "053055dfa80eb72f140b8ce6da9fb138f2e6486d",
      "parents": [
        "67fbddfdc2cafd63c83d3bb55a2451d4c26f546d"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Tue Aug 09 14:20:59 2016 -0700"
      },
      "committer": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Tue Aug 09 14:20:59 2016 -0700"
      },
      "message": "Fix clang-tidy warnings in drm.\n\n* Add explicit keyword to conversion constructors.\nBug: 28341362\n* Use const reference type for read-only parameters.\nBug: 30407689\n* Use const reference type to avoid unnecessary copy.\nBug: 30413862\nTest: build with WITH_TIDY\u003d1\n\nChange-Id: Idf1c48d7bfe3f0da20401cb3ff1983ec00be170d\n"
    },
    {
      "commit": "c5ce33d3f70bb8755a7ae964b1f558ce9b20a959",
      "tree": "7ed952ba9aaa959c5205b2b87d9f934dde804e80",
      "parents": [
        "61286f7829294a5ddaa5f852afa2fb3ea2eebcd6",
        "85dbe661a2989d1c51182b62701e412104fbfffc"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Sat Aug 06 01:28:10 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sat Aug 06 01:28:10 2016 +0000"
      },
      "message": "MediaPlayerService: clear output in CallbackData when recycling AudioTrack. am: adee56abc3\nam: 85dbe661a2\n\nChange-Id: If59f8e28b33334f3273500506bf041940951527c\n"
    },
    {
      "commit": "adee56abc3749b18f90e7788990a0b5ae1bf430e",
      "tree": "98a630421dbcf4c8f27b810666ba03f2437f4310",
      "parents": [
        "e7449bf60c861f1dea7510f706004dfdb5efb2a7"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Aug 05 15:40:34 2016 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Aug 05 15:40:34 2016 -0700"
      },
      "message": "MediaPlayerService: clear output in CallbackData when recycling AudioTrack.\n\nBug: 30365636\nChange-Id: I3832a309f78a6fa89d4afea7bdd7139f0d9013f4\n"
    },
    {
      "commit": "6575a6f5df018281b03700579099d05b35101ec1",
      "tree": "768d4fadbca24af5541c50db26960bf37f88bc7f",
      "parents": [
        "b78d2df84cfc926142ad95ba35e8ec6ab2f74eb3",
        "b4cb73e7f079d6639e1f3eae5adaf138a167f3f3"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 19 03:57:40 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 19 03:57:40 2016 +0000"
      },
      "message": "Merge \\\"AudioSink: set configurations correctly for recycled track.\\\" into nyc-mr1-dev\nam: b4cb73e7f0\n\nChange-Id: Ie0022ddf183bec7c8c547e56c715500c3588a89c\n"
    },
    {
      "commit": "b4cb73e7f079d6639e1f3eae5adaf138a167f3f3",
      "tree": "d696cf08253a07fbad66ac22b5b1ff79d06bead8",
      "parents": [
        "542cb3f42970275b9d6828d409ba697dab202861",
        "e0bbac912f9ea561ed96ad8b0a354cbab8f345a1"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 19 03:51:48 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Jul 19 03:51:48 2016 +0000"
      },
      "message": "Merge \"AudioSink: set configurations correctly for recycled track.\" into nyc-mr1-dev"
    },
    {
      "commit": "e0bbac912f9ea561ed96ad8b0a354cbab8f345a1",
      "tree": "286de5eb65dd7cd335648da9ae5d65f233c6e4d3",
      "parents": [
        "9f6392250bf6d02a514bd83b743906dda748dee9"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Mon Jul 18 16:04:53 2016 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Mon Jul 18 18:18:09 2016 -0700"
      },
      "message": "AudioSink: set configurations correctly for recycled track.\n\nBug: 29838892\nChange-Id: Ib64db16aeeaa4436d082a4098a21a75376119ef0\n"
    },
    {
      "commit": "881f62d5a1da2f0cf7222a8d304fa58faa154197",
      "tree": "8c82c7c027d8334ad82dc639e428666560a41e22",
      "parents": [
        "77e39d9c068b67e8fa6f78ef79a5126584bdd735",
        "bc7e8996c2be0377a659348649367c2d9455f21d"
      ],
      "author": {
        "name": "Takahiro Aizawa",
        "email": "takahiro.aizawa@sonymobile.com",
        "time": "Fri Jul 15 23:41:07 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jul 15 23:41:07 2016 +0000"
      },
      "message": "Merge \\\"Add null check for rtsp source\\\" into nyc-mr1-dev\nam: bc7e8996c2\n\nChange-Id: Ic0ad15b9eef3049bab98b01a6e495743988632f6\n"
    },
    {
      "commit": "bc7e8996c2be0377a659348649367c2d9455f21d",
      "tree": "b7f64bc1cd8aed0b93d739024d9fcadb7d0e1436",
      "parents": [
        "b800dfd8239f6fe0248b3034d75429b1e452d5e2",
        "c622c584ea0ffb807eb9f711aa30016eae069c92"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Fri Jul 15 23:34:23 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Jul 15 23:34:23 2016 +0000"
      },
      "message": "Merge \"Add null check for rtsp source\" into nyc-mr1-dev"
    },
    {
      "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": "e98f14ff194bd00ed71574cff19340c1090c78dd",
      "tree": "4444c32cfea40c34aa704e4256905b0b7ebdfd44",
      "parents": [
        "9bbbdd3cab5c6b93649cbf31ba3097218944b06a",
        "cdeb6603d862cec4adac7c39f3b8b240f2b645dc"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Fri Jul 15 06:04:46 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Jul 15 06:04:47 2016 +0000"
      },
      "message": "Merge \"GenericSource: Allow multiple buffer reads for video\" into nyc-mr1-dev"
    },
    {
      "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": "83efe020b94d29132bd4d5cbe049a15abad0095a",
      "tree": "b3b1be55898e24fc29f464342802b5ad301b1821",
      "parents": [
        "87cbfa8c5ecbe515c380d5592cef20c1fafe36b7",
        "f59c0bafebcd795b20141bf928a5cab8ac46e882"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Fri Jul 15 03:30:31 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Jul 15 03:30:32 2016 +0000"
      },
      "message": "Merge \"IMediaSource: Improve shared memory buffer transfer\" into nyc-mr1-dev"
    },
    {
      "commit": "78ef32963c91d4c2e8d4e1cb361987b0438fc7f3",
      "tree": "7a6ed701f782e1a9197077aa9fc11c0480724980",
      "parents": [
        "38667cc8c1c46b66665e4a17d60e44e708c184b4",
        "87cbfa8c5ecbe515c380d5592cef20c1fafe36b7"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Jul 15 01:26:13 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jul 15 01:26:13 2016 +0000"
      },
      "message": "Merge \\\"stagefright: prefer B frames for high frame-rate recording\\\" into nyc-mr1-dev\nam: 87cbfa8c5e\n\nChange-Id: I7648f002a8c6f8385abcac3b80f768cddc1b3722\n"
    },
    {
      "commit": "0bdc8b005ffa5f74f6188acf2923aa42ca28bed0",
      "tree": "0220285a449f304db8e0987fdb68ba75635ab14c",
      "parents": [
        "fc33e4017e2adaeacb0c4deffc762c612d70f256",
        "8dcd820534b11b9b2f10cd2e1f6601cb472f424a"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Jul 15 01:26:12 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jul 15 01:26:12 2016 +0000"
      },
      "message": "Merge \\\"stagefright: update temporal layering selection in MediaRecorder\\\" into nyc-mr1-dev\nam: 8dcd820534\n\nChange-Id: I6ae23ad45ae59d3f450ebf53ceba13e6ad0a6b43\n"
    },
    {
      "commit": "87cbfa8c5ecbe515c380d5592cef20c1fafe36b7",
      "tree": "d100a80cfa3b8df1a8219270a19de244510085f0",
      "parents": [
        "db2d2066e6e3f3ce728c2b17ed0923b02834519b",
        "e19f2956de379b9c9a852d50d83d0608ca42bfe9"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri Jul 15 01:22:26 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Jul 15 01:22:26 2016 +0000"
      },
      "message": "Merge \"stagefright: prefer B frames for high frame-rate recording\" into nyc-mr1-dev"
    },
    {
      "commit": "8dcd820534b11b9b2f10cd2e1f6601cb472f424a",
      "tree": "87ed46c9b40b7ed0701359d2de7431320d47186e",
      "parents": [
        "b00a831ccc86d9274dbdd06256546947115783e2",
        "2da225766572a3d4746b4e21cb231a0243b114ab"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Fri Jul 15 01:19:35 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Jul 15 01:19:36 2016 +0000"
      },
      "message": "Merge \"stagefright: update temporal layering selection in MediaRecorder\" into nyc-mr1-dev"
    },
    {
      "commit": "a23429a8050e188ee5f7c3390b9766c49f6f3dd3",
      "tree": "aea9e6380b83bae1123f46ff0ca52bb2561590a0",
      "parents": [
        "8ccd117143f4e0c9fc05102f8101f67ad1f11da6",
        "6fb884ae1cdac4ac87cfc56f2dc35ce21298b7dc"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Jul 14 22:58:32 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jul 14 22:58:32 2016 +0000"
      },
      "message": "Merge \\\"stagefright: don\\\u0027t auto-drop temporal layers for unknown SVC streams\\\" into nyc-mr1-dev\nam: 6fb884ae1c\n\nChange-Id: Id5e46a10ec931331946ec1474d52a0280250ea6c\n"
    },
    {
      "commit": "9fb815244cc33927e14ce0fe70539786a611daf9",
      "tree": "6609e29e0c6b6a834caf7d9a60d2647f65b08731",
      "parents": [
        "a5bcf56619a70b0b46c737a29d873bbff8fb77a4"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Jul 14 07:33:43 2016 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Jul 14 22:49:05 2016 +0000"
      },
      "message": "stagefright: don\u0027t auto-drop temporal layers for unknown SVC streams\n\n- SVC optimization requires knowin the number of layers which is\n  using custom signaling. Don\u0027t drop temporal layers without that information.\n\nAlso SVC optimization fixes:\n\n- Play back all layers immediately after an IDR frame (previous logic\n  required leveling up one level at a time that only works for hierarchical\n  B frames)\n- Track current max layer-ID during dropping so we can react to upward\n  changes in the allowed layers more quickly.\n- Get up to 90% of display rate before dropping layers (up from 50%)\n\nBug: 27596987\nChange-Id: Ia6c8363fc154c822a5b2a268e2f40678212a487c\n"
    },
    {
      "commit": "e19f2956de379b9c9a852d50d83d0608ca42bfe9",
      "tree": "586ef72882396f3ea01bc885c7b4fb99f45620d8",
      "parents": [
        "2da225766572a3d4746b4e21cb231a0243b114ab"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Jul 14 15:22:10 2016 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Jul 14 15:25:13 2016 -0700"
      },
      "message": "stagefright: prefer B frames for high frame-rate recording\n\nSome codecs do not support B-frames with temporal layering.\n- Prefer temporal layering for slow-motion and time lapse videos\n(since B-frames are not as useful for time lapse, and layering is\n needed for slow-motion)\n- Prefer B-frames for HFR capture\n\nBug: 27596987\nChange-Id: I12f530e9f624e2948e176b5548e0d9d65eed95d8\n"
    },
    {
      "commit": "2da225766572a3d4746b4e21cb231a0243b114ab",
      "tree": "8036414716c275db15eece15a62dadafd719a474",
      "parents": [
        "764e119d3bb1016c868b2334056e1e619dd9b3a5"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Jul 14 10:54:41 2016 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Jul 14 15:24:06 2016 -0700"
      },
      "message": "stagefright: update temporal layering selection in MediaRecorder\n\n- Use max expected decode framerate to decide on number of layers\n- Optimize for decoding on 30fps display (battery saver mode)\n\nBug: 27596987\nChange-Id: I8902b4a78670cb0aebb8bccd640367e262f172b2\n"
    },
    {
      "commit": "d8d966fef52fe6a236e8ffdd43604e0ceeb0fab3",
      "tree": "3e35ca130052498eccc53eac2f4f07c501ab5de5",
      "parents": [
        "f3c0ccf224e89e81e733a50e49f2c1cd372ff29a",
        "c0a1a3187c30a9140fd2e0d185339be5966ae5d8"
      ],
      "author": {
        "name": "Sergio Giro",
        "email": "sgiro@google.com",
        "time": "Thu Jul 14 18:14:54 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jul 14 18:14:54 2016 +0000"
      },
      "message": "Add bound checks to utf16_to_utf8 am: 0c9742db80\nam: c0a1a3187c\n\nChange-Id: I050e58df0250e5d685b03c3e572bb756e9f997f0\n"
    },
    {
      "commit": "c0a1a3187c30a9140fd2e0d185339be5966ae5d8",
      "tree": "e9a3414769756a1f2551c9c82dae1f0b084fc4b4",
      "parents": [
        "6007caa57e80d822275f6272ffaa870be2c49f1f",
        "0c9742db802c21274fa299fbf7a8bf7c0c49355d"
      ],
      "author": {
        "name": "Sergio Giro",
        "email": "sgiro@google.com",
        "time": "Thu Jul 14 18:06:57 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jul 14 18:06:57 2016 +0000"
      },
      "message": "Add bound checks to utf16_to_utf8\nam: 0c9742db80\n\nChange-Id: Iacb2248ca498ae3b0ec699c44218963b97405b3b\n"
    },
    {
      "commit": "ea648c61a5db55e41ea98bf42500a458cadd8e64",
      "tree": "65bf9e471c607a42f7291a4a68570195cb8aa14d",
      "parents": [
        "f5ae7b4790fe8e4432dc6270dacf1685d6f97723",
        "37d7af3c3a95022465b86b6cdec9db9fb5a40fd1"
      ],
      "author": {
        "name": "Sergio Giro",
        "email": "sgiro@google.com",
        "time": "Thu Jul 14 18:06:56 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jul 14 18:06:56 2016 +0000"
      },
      "message": "Add bound checks to utf16_to_utf8\nam: 37d7af3c3a\n\nChange-Id: Ib0670b8f8583ad5e67b4e75ba59ce345fe1ce35a\n"
    },
    {
      "commit": "4f24f218dc0059f101b541557f70abe45f9f8522",
      "tree": "c74702f2e3a94cd1ffaba068d3bfde8323386123",
      "parents": [
        "d88de681cdbbd1074cc5ca31e6a6f99e2be0fc1e",
        "edce8ad0608f6828dae70ce33be31d27c8773157"
      ],
      "author": {
        "name": "Sergio Giro",
        "email": "sgiro@google.com",
        "time": "Thu Jul 14 17:59:53 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jul 14 17:59:53 2016 +0000"
      },
      "message": "DO NOT MERGE Add bound checks to utf16_to_utf8 am: 0d9d569c26\nam: edce8ad060\n\nChange-Id: I1c725b97d3f1fcabaa7129200ca67c3d479fd771\n"
    },
    {
      "commit": "0d9d569c268128f993abd45563af39e98646bcce",
      "tree": "90963cfee9c39f6029a4b1f3de127e1890709812",
      "parents": [
        "da2ac348fc3b33c750d29b6e65371819d9fedf8b"
      ],
      "author": {
        "name": "Sergio Giro",
        "email": "sgiro@google.com",
        "time": "Tue Jun 28 18:24:52 2016 +0100"
      },
      "committer": {
        "name": "Sergio Giro",
        "email": "sgiro@google.com",
        "time": "Thu Jul 14 17:23:40 2016 +0000"
      },
      "message": "DO NOT MERGE Add bound checks to utf16_to_utf8\n\nBug: 29250543\n(cherry picked from commit 1d3f4278b2666d1a145af2f54782c993aa07d1d9)\n\nChange-Id: Id4ffb4bee02c3bd53796723b4cbcc88e693f8e83\n"
    },
    {
      "commit": "0c9742db802c21274fa299fbf7a8bf7c0c49355d",
      "tree": "711a134e24f82d1d0346b331398eb5aca7040d90",
      "parents": [
        "cc17d003ee1e0914d046647cd5f27fe2e80dff6b"
      ],
      "author": {
        "name": "Sergio Giro",
        "email": "sgiro@google.com",
        "time": "Tue Jun 28 18:24:52 2016 +0100"
      },
      "committer": {
        "name": "Sergio Giro",
        "email": "sgiro@google.com",
        "time": "Thu Jul 14 15:26:48 2016 +0000"
      },
      "message": "Add bound checks to utf16_to_utf8\n\nBug: 29250543\nChange-Id: I3518416e89ed901021970958fb6005fd69129f7c\n(cherry picked from commit 1d3f4278b2666d1a145af2f54782c993aa07d1d9)\n"
    },
    {
      "commit": "804c3b54a34be03ab576390797acc93607114225",
      "tree": "d19672c2cd35361234fdc14d4be4b2f7633399ef",
      "parents": [
        "7a9538cd36716c8263d3808edd58bc87cedd8492"
      ],
      "author": {
        "name": "Sergio Giro",
        "email": "sgiro@google.com",
        "time": "Tue Jun 28 18:24:52 2016 +0100"
      },
      "committer": {
        "name": "Sergio Giro",
        "email": "sgiro@google.com",
        "time": "Thu Jul 14 14:47:01 2016 +0000"
      },
      "message": "DO NOT MERGE Add bound checks to utf16_to_utf8\n\nBug: 29250543\n(cherry picked from commit 1d3f4278b2666d1a145af2f54782c993aa07d1d9)\n\nChange-Id: Id4ffb4bee02c3bd53796723b4cbcc88e693f8e83\n"
    },
    {
      "commit": "37d7af3c3a95022465b86b6cdec9db9fb5a40fd1",
      "tree": "b7d58e6a6c975599436e044a420ccd041b53ddf8",
      "parents": [
        "786ddba2862716164920b455c4d5a1b3a7454193"
      ],
      "author": {
        "name": "Sergio Giro",
        "email": "sgiro@google.com",
        "time": "Tue Jun 28 18:24:52 2016 +0100"
      },
      "committer": {
        "name": "Sergio Giro",
        "email": "sgiro@google.com",
        "time": "Thu Jul 14 13:22:21 2016 +0000"
      },
      "message": "Add bound checks to utf16_to_utf8\n\nBug: 29250543\nChange-Id: I3518416e89ed901021970958fb6005fd69129f7c\n(cherry picked from commit 1d3f4278b2666d1a145af2f54782c993aa07d1d9)\n"
    },
    {
      "commit": "f396b630691c47e3323ed1deb2b2ce22bf1426bb",
      "tree": "45aeb8aa200de294709e850ecf1fcf858d744e7d",
      "parents": [
        "df7ed7540b72f5663ee47a9628489f2855ac1126",
        "fa6a70ab138b2deac81be61db7ab3041d698c9d0"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu Jul 14 02:37:58 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jul 14 02:37:58 2016 +0000"
      },
      "message": "Merge \\\"stagefright: enable temporal layering for timelapse and hfr recording\\\" into nyc-mr1-dev\nam: fa6a70ab13\n\nChange-Id: I12ccd929fbee67ed6d6d7be406a01ab181b5af55\n"
    },
    {
      "commit": "c96cfbe66d7bf261c57ff93984bc6a4b3a58f6fc",
      "tree": "7a4722fca0d9d0231d559bb25c9ef97a25a948ed",
      "parents": [
        "e4aebb03ae43d22b3d85c6e6913cfb517ae14217"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Jul 13 07:56:02 2016 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Wed Jul 13 16:27:19 2016 -0700"
      },
      "message": "stagefright: enable temporal layering for timelapse and hfr recording\n\nBug: 27596987\nChange-Id: I310abc22425290117629d5e592f473396a5733d1\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": "4bcec886d7a228bef86da16137571306751b99cd",
      "tree": "fb765bff830a31f20ff015bf1855375de0bc52b6",
      "parents": [
        "84fd507c3dc666947811af5d5f134f7dbe9a09de",
        "412bfccc79b17fc8684af6704c01a69dd94033d8"
      ],
      "author": {
        "name": "Praveen Chavan",
        "email": "pchavan@codeaurora.org",
        "time": "Wed Jul 13 01:30:54 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 13 01:30:54 2016 +0000"
      },
      "message": "Merge \\\"NuPlayer: adjust temporal-layers to achieve smooth play\\\" into nyc-mr1-dev\nam: 412bfccc79\n\nChange-Id: If911a557ce1e53d10061b0d635553fc8556171c9\n"
    },
    {
      "commit": "c622c584ea0ffb807eb9f711aa30016eae069c92",
      "tree": "f2746bf2a731482f4ab207bc5c7d450b9e2bdf48",
      "parents": [
        "e37b911fbf70c15c652db8585bca2a5f035d9def"
      ],
      "author": {
        "name": "Takahiro Aizawa",
        "email": "takahiro.aizawa@sonymobile.com",
        "time": "Mon Jun 20 09:53:47 2016 +0900"
      },
      "committer": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Tue Jul 12 18:07:49 2016 -0700"
      },
      "message": "Add null check for rtsp source\n\nDuring playback contents with multi audio tracks or multi video tracks,\ncrash occurs in checkBuffering() which is added from Android-N.\nThe reason is because instance is not set in mSource in onConnected().\nThis commit adds null check to prevent crash.\n\nBug: 29520487\n\nChange-Id: I893c11a7339e938b1f3b79805c2fb3d9be5cfc96\nSigned-off-by: ZHU XINGYUE \u003czhu.x.xingyue@sonymobile.com\u003e\n"
    },
    {
      "commit": "bbaa144657862e424ed6a199edbd36b5a93c93ad",
      "tree": "8ea45105fd16a1cfedc342e9f011899b1ad5e77e",
      "parents": [
        "0093efba5a3afae93dcd2664a8a54a8306cb538b"
      ],
      "author": {
        "name": "Praveen Chavan",
        "email": "pchavan@codeaurora.org",
        "time": "Fri Apr 08 13:33:49 2016 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue Jul 12 16:35:48 2016 -0700"
      },
      "message": "NuPlayer: adjust temporal-layers to achieve smooth play\n\nFor multi-layer-encoded content (with hierarchical referencing),\nselect a subset of layers based on playback speed.\n\nBug: 27596987\nChange-Id: I824c699f3c2b80bb516c1b44493eda72239291ac\n(cherry picked from commit 64ad0e0b2b5f992052d287e82ebd79f9f892dcbf)\n"
    },
    {
      "commit": "c33ece57d98dad7247b4f63e878aeffe2decf289",
      "tree": "5cb627cedead02e4107bd237d7fb66337844a757",
      "parents": [
        "f517d276a8bfe4034106abf8009fcd6cc28a0838",
        "bea67b8a707b8875419019ebd2d568090310b326"
      ],
      "author": {
        "name": "Sergio Giro",
        "email": "sgiro@google.com",
        "time": "Mon Jul 11 12:22:34 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Jul 11 12:22:34 2016 +0000"
      },
      "message": "Merge \\\"Add bound checks to utf16_to_utf8\\\" into nyc-mr1-dev\nam: bea67b8a70\n\nChange-Id: I4281c4eabbabc991f2fa5d1052d30194dfacc630\n"
    },
    {
      "commit": "bea67b8a707b8875419019ebd2d568090310b326",
      "tree": "59708f53d9c4950fda3d1e1324eb0ec62e6bd48c",
      "parents": [
        "5cc2e814acac142c77eed4e9b8d954623be8965c",
        "1d3f4278b2666d1a145af2f54782c993aa07d1d9"
      ],
      "author": {
        "name": "Sergio Giro",
        "email": "sgiro@google.com",
        "time": "Mon Jul 11 12:11:30 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Jul 11 12:11:32 2016 +0000"
      },
      "message": "Merge \"Add bound checks to utf16_to_utf8\" into nyc-mr1-dev"
    },
    {
      "commit": "1d3f4278b2666d1a145af2f54782c993aa07d1d9",
      "tree": "a58f653e4a76988ee042eba780c6b9667ba77028",
      "parents": [
        "e8a984e43504890e0f676256a0445b9917a2af91"
      ],
      "author": {
        "name": "Sergio Giro",
        "email": "sgiro@google.com",
        "time": "Tue Jun 28 18:24:52 2016 +0100"
      },
      "committer": {
        "name": "Sergio Giro",
        "email": "sgiro@google.com",
        "time": "Tue Jun 28 18:55:43 2016 +0100"
      },
      "message": "Add bound checks to utf16_to_utf8\n\nBug: 29250543\nChange-Id: I3518416e89ed901021970958fb6005fd69129f7c\n"
    },
    {
      "commit": "6851089a7eb9e76fe30de0de98ddd32b36c39095",
      "tree": "6b3eaabc286cb5b42de81d285a3aa6d6445db1b6",
      "parents": [
        "53789bfd3985ea84045bb63bf07ca125c2e7141e",
        "d023a7707fe551817fb3f7539f68a388b3381f41"
      ],
      "author": {
        "name": "Hangyu Kuang",
        "email": "hkuang@google.com",
        "time": "Tue Jun 28 03:08:50 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jun 28 03:08:50 2016 +0000"
      },
      "message": "Merge \\\"media: set correct mode if both capture and playback rate are set.\\\" into nyc-mr1-dev\nam: d023a7707f\n\nChange-Id: I61be6e2b08da37bfb7b018641d5eb49f4d8633fa\n"
    },
    {
      "commit": "d023a7707fe551817fb3f7539f68a388b3381f41",
      "tree": "5d73cb217c8fff66a31b4c005fe6941152264a50",
      "parents": [
        "7b171a9e7be64e9881ed03baad1422d75ca768a4",
        "5a4a0a1e4a44b8e48aff8e74df56d37dc6d7129c"
      ],
      "author": {
        "name": "Hangyu Kuang",
        "email": "hkuang@google.com",
        "time": "Tue Jun 28 03:02:34 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Jun 28 03:02:34 2016 +0000"
      },
      "message": "Merge \"media: set correct mode if both capture and playback rate are set.\" into nyc-mr1-dev"
    },
    {
      "commit": "5a4a0a1e4a44b8e48aff8e74df56d37dc6d7129c",
      "tree": "b5d5dafc6cc8dfc6b942dc4462015b3c5f349b04",
      "parents": [
        "901ca36bf02726ca07d83820c93c76d696549a03"
      ],
      "author": {
        "name": "Hangyu Kuang",
        "email": "hkuang@google.com",
        "time": "Thu Jun 23 15:03:20 2016 -0700"
      },
      "committer": {
        "name": "Hangyu Kuang",
        "email": "hkuang@google.com",
        "time": "Mon Jun 27 16:44:04 2016 -0700"
      },
      "message": "media: set correct mode if both capture and playback rate are set.\n\nThis will avoid the recording operate in slow motion/time-lapse mode even\nif capture rate and playback rate diff a little bit.\n\nBug:28313712\nChange-Id: I7b50c6eacbde4189a4d0d76f95861dd029991685\n"
    },
    {
      "commit": "85eb70d63f722641eb0b382e8137fee88b56b69f",
      "tree": "764a2e3dd6cf0194bfb3709eb7c2cf343b03bf76",
      "parents": [
        "2dd124980b4d90daae60127eec56a88bda7e417b",
        "e5d45332a2d8abb44e4ec2964c3d965c28144030"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Jun 17 13:35:46 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Jun 17 13:35:46 2016 +0000"
      },
      "message": "Merge \"Using requested video scaling mode in NuPlayer\" into nyc-mr1-dev"
    },
    {
      "commit": "e8653ac8f0a8c9a2e91e73dccdc45e70c161b0c0",
      "tree": "3c0ab6d608cb53bcec72646e1f61f1c575d4f786",
      "parents": [
        "e193b37a92515206241a25ede18fcab5678354fd",
        "bfc9d5e5d594652410ee03827adf01b323818952"
      ],
      "author": {
        "name": "Bartosz Dolewski",
        "email": "bartosz.dolewski@sonymobile.com",
        "time": "Fri Jun 17 02:32:18 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jun 17 02:32:18 2016 +0000"
      },
      "message": "Merge \\\\\\\"Using requested video scaling mode in NuPlayer\\\\\\\" am: 42cf4c39dc am: f8f2f89cf1\nam: bfc9d5e5d5\n\nChange-Id: I44dc761fde557fa49b178d208c0ae9474d65596b\n"
    },
    {
      "commit": "f8f2f89cf1781091cba8ce8ce6f38bc6ad069dff",
      "tree": "2e8f1de6f23681bfab68c582d6e0d5eba76654b5",
      "parents": [
        "dbcce36298345b3e40034e44f2ba706e3c544f1e",
        "42cf4c39dcfc7c2cbd9fa3e6769dcd130d56c171"
      ],
      "author": {
        "name": "Bartosz Dolewski",
        "email": "bartosz.dolewski@sonymobile.com",
        "time": "Fri Jun 17 02:24:00 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jun 17 02:24:00 2016 +0000"
      },
      "message": "Merge \\\"Using requested video scaling mode in NuPlayer\\\"\nam: 42cf4c39dc\n\nChange-Id: I3fa1f06ba5a492019371e43dd08f38ffa24aafca\n"
    },
    {
      "commit": "e5d45332a2d8abb44e4ec2964c3d965c28144030",
      "tree": "3fc790c4bb039e758357afd80757f8e2b45996b5",
      "parents": [
        "331d46c3f71e2a1e9bb315c4a428cbf399882597"
      ],
      "author": {
        "name": "Bartosz Dolewski",
        "email": "bartosz.dolewski@sonymobile.com",
        "time": "Thu Dec 11 12:47:08 2014 +0100"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu Jun 16 19:21:37 2016 -0700"
      },
      "message": "Using requested video scaling mode in NuPlayer\n\nIn comparison to AwesomePlayer, NuPlayer has lack of setting\nthe video scaling mode flag on event kWhatVideoSizeChanged.\nThat causes the issues with wrong video screen ratio, because\nACodec has hardcoded flag which was the last one set up for\nparticular native window object, even that flow goes back to NuPlayer.\n\nBug: 29338922\n\nChange-Id: I1fe28e64d58cdec0cda596eb2f6640ab9be7fd21\n(cherry picked from commit 26936f7bd94594e6c5a13332b3899e67f230cba0)\n"
    },
    {
      "commit": "42cf4c39dcfc7c2cbd9fa3e6769dcd130d56c171",
      "tree": "b9b1ea270edc6597ab1c7444ea42df4329efc4dd",
      "parents": [
        "fbd40d6690edf4352144c22718ade312ac1dba95",
        "26936f7bd94594e6c5a13332b3899e67f230cba0"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Jun 17 02:15:23 2016 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Fri Jun 17 02:15:23 2016 +0000"
      },
      "message": "Merge \"Using requested video scaling mode in NuPlayer\""
    },
    {
      "commit": "26936f7bd94594e6c5a13332b3899e67f230cba0",
      "tree": "dc93a8843fd2f870712aae00edc1876f5abf3608",
      "parents": [
        "2d772fd4afd1481a8cea5f59b890d771dbada2f6"
      ],
      "author": {
        "name": "Bartosz Dolewski",
        "email": "bartosz.dolewski@sonymobile.com",
        "time": "Thu Dec 11 12:47:08 2014 +0100"
      },
      "committer": {
        "name": "Takahiro Aizawa",
        "email": "Takahiro.Aizawa@sonymobile.com",
        "time": "Wed Jun 15 08:49:31 2016 +0000"
      },
      "message": "Using requested video scaling mode in NuPlayer\n\nIn comparison to AwesomePlayer, NuPlayer has lack of setting\nthe video scaling mode flag on event kWhatVideoSizeChanged.\nThat causes the issues with wrong video screen ratio, because\nACodec has hardcoded flag which was the last one set up for\nparticular native window object, even that flow goes back to NuPlayer.\n\nBug: 29338922\n\nChange-Id: I1fe28e64d58cdec0cda596eb2f6640ab9be7fd21\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": "655db71f0d3125526426e9b4c5862c028a3c2fa6",
      "tree": "41bdfa3c264c194fba60366eaf287ce6a6c08704",
      "parents": [
        "0c39e52f03a8020bc17d72a1deb5ef31e61ea53a",
        "247a92eec4b0a8e4a9fd31b2755e96928b2895d0"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed Jun 08 22:18:53 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jun 08 22:18:53 2016 +0000"
      },
      "message": "Merge \\\"NuPlayer: set mPaused to false in onStart().\\\" into nyc-dev\nam: 247a92eec4\n\nChange-Id: I3c7aeaf4b17eaf9e6478352fb899551a429303dd\n"
    },
    {
      "commit": "247a92eec4b0a8e4a9fd31b2755e96928b2895d0",
      "tree": "ea020a105c527eef0d2c1402cda55500b60e7f7a",
      "parents": [
        "8a092d306e3fb228628506ffd73d9d9f0387f271",
        "fe8fe7dc0316289e7f03690bcbe2332b395ba331"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed Jun 08 22:10:09 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Jun 08 22:10:09 2016 +0000"
      },
      "message": "Merge \"NuPlayer: set mPaused to false in onStart().\" into nyc-dev"
    },
    {
      "commit": "fe8fe7dc0316289e7f03690bcbe2332b395ba331",
      "tree": "00d2147e4bbea7b9c6d702c1fe0baf6a167c63e5",
      "parents": [
        "596e81bc4f32f8a205b4885c03b240b90e7ef090"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed Jun 08 10:29:25 2016 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed Jun 08 10:29:25 2016 -0700"
      },
      "message": "NuPlayer: set mPaused to false in onStart().\n\nBug: 29209515\nChange-Id: I96c506feccd7105a63421a7b9444385d4fa6e7d8\n"
    },
    {
      "commit": "f3360accc10aaaa5d21aa4f385f6d4cd473948dd",
      "tree": "da5978d711e33d1c126c9c87a53b03d84a9e8956",
      "parents": [
        "3832a6fc827ab7c580117e0cdaff8bb914629d51",
        "8a092d306e3fb228628506ffd73d9d9f0387f271"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed Jun 08 17:23:52 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jun 08 17:23:52 2016 +0000"
      },
      "message": "NuPlayer: fix behavior of setPlaybackParams.\nam: 8a092d306e\n\nChange-Id: I5042d302cea9fcbfbf3fdaaabba90086da0e5ea0\n"
    },
    {
      "commit": "8a092d306e3fb228628506ffd73d9d9f0387f271",
      "tree": "af2b225d09bb55dba5ba5505f8a6444dc5c1e039",
      "parents": [
        "596e81bc4f32f8a205b4885c03b240b90e7ef090"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Jun 03 14:57:24 2016 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Mon Jun 06 14:36:07 2016 -0700"
      },
      "message": "NuPlayer: fix behavior of setPlaybackParams.\n\nsetPlaybackParams with zero speed is equivalent to pause().\nsetPlaybackParams with non-zero speed should start playback when player has\nbeen prepared.\nBug: 29032949\n\nChange-Id: Ib7738da653208f4fe5a8f1d7cf98b8479b3dc798\n"
    },
    {
      "commit": "1785050a7ebb4e5e8e14f8a17b194362f0dd4b12",
      "tree": "71787af82e636ac69d2ac1033a6b825dc8432234",
      "parents": [
        "29cc033c02a995e1d02a353627dfe93231239352",
        "aaa28debcb0d2475d065a467281d1cc77c7c4aca"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri May 27 23:58:49 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri May 27 23:58:49 2016 +0000"
      },
      "message": "Merge \"NuPlayerRenderer: ignore fractional audio frame.\" into nyc-dev\nam: aaa28debcb\n\n* commit \u0027aaa28debcb0d2475d065a467281d1cc77c7c4aca\u0027:\n  NuPlayerRenderer: ignore fractional audio frame.\n\nChange-Id: Iaf78c5fd956bfdbaf2025f06bb58e454d6bd27c1\n"
    },
    {
      "commit": "aaa28debcb0d2475d065a467281d1cc77c7c4aca",
      "tree": "67c18a4932228de9efa2b788b0a84ea6d5c69b0d",
      "parents": [
        "65f611a0e99133244f77c853495083733444b231",
        "03cee24b8d54e5b5a94957b9fb7049738ff68765"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri May 27 23:51:06 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri May 27 23:51:07 2016 +0000"
      },
      "message": "Merge \"NuPlayerRenderer: ignore fractional audio frame.\" into nyc-dev"
    },
    {
      "commit": "03cee24b8d54e5b5a94957b9fb7049738ff68765",
      "tree": "0dea71cf50a47b7f0196acb85d070914b8d8173e",
      "parents": [
        "4ecb8af13a00dd6331a3e957af5c3230f537e923"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Thu May 26 15:22:59 2016 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri May 27 16:29:12 2016 -0700"
      },
      "message": "NuPlayerRenderer: ignore fractional audio frame.\n\nBug: 27488269\nChange-Id: I3f0e38f972e9d28b6edd8a4286b334021be81371\n"
    },
    {
      "commit": "dce4f9f87d7e0084406f3c73cc7db27c4708a2f5",
      "tree": "7bd1412664f83b5ecd44e39c159a63d6318b6ffa",
      "parents": [
        "336e999bb2efbf571bc605dc40d34040dde90f62",
        "01f69476f61484a504f15123debe332dd39fd47f"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed May 25 23:45:46 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 25 23:45:46 2016 +0000"
      },
      "message": "Merge \"RTSPSource: pause internally when buffering starts.\" into nyc-dev\nam: 01f69476f6\n\n* commit \u002701f69476f61484a504f15123debe332dd39fd47f\u0027:\n  RTSPSource: pause internally when buffering starts.\n\nChange-Id: Icd0789ec7029a76579b05ae4b5a024dfda19d15b\n"
    },
    {
      "commit": "01f69476f61484a504f15123debe332dd39fd47f",
      "tree": "37179ea59b16bad79930b76a681bf1bfd06ed6b9",
      "parents": [
        "f489ff899861a385c36b548bd51d0c6e17f8e67f",
        "c9ff2009a0a010eeaba80d76493fbf33fcb561c8"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed May 25 23:32:42 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 25 23:32:42 2016 +0000"
      },
      "message": "Merge \"RTSPSource: pause internally when buffering starts.\" into nyc-dev"
    },
    {
      "commit": "ff8818df6f6bd07f80b9426af23a5f377e5843d6",
      "tree": "516e53702b4288a34f7dbd5776cac5d1fe08da53",
      "parents": [
        "28561389e9c344cbc699b58ad5b490505e9342b1",
        "5f44938fe991e19dd694a08c5e8911a9ffa2670b"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed May 25 21:43:28 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 25 21:43:28 2016 +0000"
      },
      "message": "resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 am: f4285f22bf am: 87406db29c\nam: 5f44938fe9\n\n* commit \u00275f44938fe991e19dd694a08c5e8911a9ffa2670b\u0027:\n  MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.\n\nChange-Id: I961243ce29ba0296ad9aad927424cc67b39489e3\n"
    },
    {
      "commit": "5f44938fe991e19dd694a08c5e8911a9ffa2670b",
      "tree": "6a59b06e43d7f702a99c5d313651f6a7396272a3",
      "parents": [
        "c65002b096c4015e798a0ea685df0119c137b596",
        "87406db29c09e16df8f0d82dd0547d3fb953ab92"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed May 25 21:38:02 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 25 21:38:02 2016 +0000"
      },
      "message": "resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 am: f4285f22bf\nam: 87406db29c\n\n* commit \u002787406db29c09e16df8f0d82dd0547d3fb953ab92\u0027:\n  MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.\n\nChange-Id: I6f37992a285efbc2fa08da3b0f6e6f0fecb52b07\n"
    },
    {
      "commit": "87406db29c09e16df8f0d82dd0547d3fb953ab92",
      "tree": "719fa99948609975d92184f4b54525d3890c98d2",
      "parents": [
        "63a4f82181744b6a6ca82226489a9138ef7823fb",
        "f4285f22bfe47791a1d21eaa28a4afce23f47c8d"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed May 25 21:32:51 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 25 21:32:51 2016 +0000"
      },
      "message": "resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67\nam: f4285f22bf\n\n* commit \u0027f4285f22bfe47791a1d21eaa28a4afce23f47c8d\u0027:\n  MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.\n\nChange-Id: I71b691a769641d3e3137b4fd954d784d073b9074\n"
    },
    {
      "commit": "f4285f22bfe47791a1d21eaa28a4afce23f47c8d",
      "tree": "bd6ac79bed27c9c5c02f7a939b48efac11f6e696",
      "parents": [
        "e83713c1987c929af2ed704e1a395a334606fad0",
        "6b52fd6b673c44afc6fe57e85ef8b6994ea84659"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed May 25 21:26:10 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 25 21:26:10 2016 +0000"
      },
      "message": "resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10\nam: 6b52fd6b67\n\n* commit \u00276b52fd6b673c44afc6fe57e85ef8b6994ea84659\u0027:\n  MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.\n\nChange-Id: I0e66a037649b0000c90c91b40af6eb587362c00b\n"
    },
    {
      "commit": "67ca3caf10929022b2b742b49a88ff1238d3bbe7",
      "tree": "8249df6d200d28dfa42e485214c8e3907d78160b",
      "parents": [
        "4223af4708e4524375385efe13f7ddebfd71ffcf",
        "823bd745b44803e9caea051aabc1a173af57c6db"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed May 25 14:10:26 2016 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed May 25 14:10:26 2016 -0700"
      },
      "message": "resolve merge conflicts of 823bd74 to lmp-mr1-dev\n\nChange-Id: Id8f856591eb2a49bf151a9caa6e15f69e6887e4c\n"
    },
    {
      "commit": "e31eeb4cc65e6b0c98d8476cb89f746ddb79a1b0",
      "tree": "f946935cf5d5e0428a821831cc61b12bba6b4bd3",
      "parents": [
        "cbe776167a52a43f6acbafd3278e662840a256c2"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri Aug 28 10:35:35 2015 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Wed May 25 03:48:11 2016 +0000"
      },
      "message": "MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.\n\nGenericSource: return error when no track exists.\n\nSampleIterator: make sure mSamplesPerChunk is not zero before using it as divisor.\n\nBug: 21657957\nBug: 23705695\nBug: 22802344\nBug: 28799341\nChange-Id: I7664992ade90b935d3f255dcd43ecc2898f30b04\n(cherry picked from commit 0386c91b8a910a134e5898ffa924c1b6c7560b13)\n"
    },
    {
      "commit": "c9ff2009a0a010eeaba80d76493fbf33fcb561c8",
      "tree": "8e7df1f4c0cd5033ce4ddd7d2243c8f8b8d470e2",
      "parents": [
        "4ecb8af13a00dd6331a3e957af5c3230f537e923"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue May 24 16:23:48 2016 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Tue May 24 16:23:48 2016 -0700"
      },
      "message": "RTSPSource: pause internally when buffering starts.\n\nBug: 28915794\nChange-Id: I1a04bdfe306fdf0f82fefbe9eb2855184991c1c8\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": "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": "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": "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": "6efa6e62bbc597def4df6d966bdfee16be572b59",
      "tree": "dea72857fab2fadb18836c9066d95da8dcf08294",
      "parents": [
        "c7fc3e21df35ed16f5af2a7d80825fcdaa777a18",
        "4ecb8af13a00dd6331a3e957af5c3230f537e923"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Mon May 23 23:38:52 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon May 23 23:38:52 2016 +0000"
      },
      "message": "Merge \"NuPlayer: remove the condition on sending BUFFERING_START event.\" into nyc-dev\nam: 4ecb8af13a\n\n* commit \u00274ecb8af13a00dd6331a3e957af5c3230f537e923\u0027:\n  NuPlayer: remove the condition on sending BUFFERING_START event.\n\nChange-Id: I992d6b70152dc6f7cc8cf6d7ecebcc0a59481cb3\n"
    },
    {
      "commit": "4ecb8af13a00dd6331a3e957af5c3230f537e923",
      "tree": "928a535a509ef23a8c5dda984e2ee18fa7959db9",
      "parents": [
        "d4b8036373f4cac1af9765d12fdd3eae99d49b5f",
        "bfe8207b2fa54a84ccbdb19fefe3a2836a2707c4"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Mon May 23 23:33:25 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon May 23 23:33:25 2016 +0000"
      },
      "message": "Merge \"NuPlayer: remove the condition on sending BUFFERING_START event.\" into nyc-dev"
    },
    {
      "commit": "bfe8207b2fa54a84ccbdb19fefe3a2836a2707c4",
      "tree": "1490004e397352a6533ea600da9f99100dea03b4",
      "parents": [
        "78d4d1e46c546a29ec86b98f4bfce71424c42213"
      ],
      "author": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Fri May 20 09:21:50 2016 -0700"
      },
      "committer": {
        "name": "Wei Jia",
        "email": "wjia@google.com",
        "time": "Mon May 23 16:17:42 2016 -0700"
      },
      "message": "NuPlayer: remove the condition on sending BUFFERING_START event.\n\nSince RTSPSource::pause() has become no op, it\u0027s safe to always send BUFFERING events.\nBug: 28915794\nBug: 25727912\nBug: 27292698\n\nChange-Id: Ia61bce13ee7ef84734ab5063a3311f0bb38e6f72\n"
    },
    {
      "commit": "013ce69d91e05d50d0f6d54943ccc3ba28fbe5e6",
      "tree": "1223cf2e7beddf3681463d89096627d44a612ea8",
      "parents": [
        "5a3b7974a42a8188d7bd5621bcc5b3b8eeac75be",
        "2b1a242470adb3ef4ba3a63c21f5415581324c4f"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Sat May 21 02:32:40 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sat May 21 02:32:40 2016 +0000"
      },
      "message": "Merge \"stagefright: fix issues with bitrate handling\" into nyc-dev\nam: 2b1a242470\n\n* commit \u00272b1a242470adb3ef4ba3a63c21f5415581324c4f\u0027:\n  stagefright: fix issues with bitrate handling\n\nChange-Id: Ibe48277a28d6cde7c4cd35383f7fb38e126a3153\n"
    },
    {
      "commit": "46f80165c595d81dda68f8f3fea27f4fb04937dd",
      "tree": "4da9697ed302ace4644f9dd27d4a0bfca357b727",
      "parents": [
        "d4c4d2248bdfd06dc7b23dd2d81541d3941f8bf9"
      ],
      "author": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Thu May 19 15:35:47 2016 -0700"
      },
      "committer": {
        "name": "Lajos Molnar",
        "email": "lajos@google.com",
        "time": "Fri May 20 03:43:30 2016 +0000"
      },
      "message": "stagefright: fix issues with bitrate handling\n\n- parse btrt mp4 box\n- write max and avg. bitrates into avcc\n- fix the use of \"bit-rate\" vs. the correct \"bitrate\"\n- document ESDS better\n- fix some spacing\n\nBug: 28671284\nChange-Id: I94961a095c6d162af38b7999cc946f899a1b1b09\n"
    },
    {
      "commit": "76c12009f52a60fc2894e1493516a9d4fb107640",
      "tree": "07523920cff677d375765ebc72f515dbb452e0ed",
      "parents": [
        "514d8c512d08824b288fa1784b33a294b0f7e81d",
        "d4c4d2248bdfd06dc7b23dd2d81541d3941f8bf9"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Tue May 17 22:57:36 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue May 17 22:57:36 2016 +0000"
      },
      "message": "Merge \"Re-enable source re-scan for StreamingSource\" into nyc-dev\nam: d4c4d2248b\n\n* commit \u0027d4c4d2248bdfd06dc7b23dd2d81541d3941f8bf9\u0027:\n  Re-enable source re-scan for StreamingSource\n\nChange-Id: I0c1460ad7178b1b617679108fa156b81003f375b\n"
    }
  ],
  "next": "d4c4d2248bdfd06dc7b23dd2d81541d3941f8bf9"
}