)]}'
{
  "log": [
    {
      "commit": "ace588cc1e78f3a83a0e410113009fb31a0f9af7",
      "tree": "7b82d5a4892f8ea53620c937927b6c9eb363cdb6",
      "parents": [
        "c5fee0a8854f5decd3b567d2383cd38f0aada4f4"
      ],
      "author": {
        "name": "Eric Tan",
        "email": "taneric@google.com",
        "time": "Wed Sep 12 11:44:43 2018 -0700"
      },
      "committer": {
        "name": "Eric Tan",
        "email": "taneric@google.com",
        "time": "Fri Sep 14 15:57:50 2018 -0700"
      },
      "message": "nblog: split NBLog.cpp into multiple files\n\nNBLog.cpp was deleted and split up into Entry.cpp, Merger.cpp,\nReader.cpp, Timeline.cpp, and Writer.cpp. NBLog.h was split up into\nEntry.h, Events.h, Merger.h, Reader.h, Timeline.h, and Writer.h. NBLog.h\nnow includes all of these new headers except Merger.h, which is managed\nexclusively by MediaLogService.\n\nOther changes:\n- changed NBLog from a class to a namespace\n- changed NBLog::thread_info_t.type to enum and replaced magic numbers\n- fixed some fragile build dependencies in libaudioclient and medialog\n\nNo other changes were made, and all functionalities that existed prior\nto this commit remain the same.\n\nTest: build, dumpsys media.log\nBug: 68148948\nChange-Id: I1ce6dcb7b30d004f90584edfad7103a89f7bab0c\n"
    },
    {
      "commit": "c5fee0a8854f5decd3b567d2383cd38f0aada4f4",
      "tree": "1cb2dc01ad245539873910eff52178d12ae815e5",
      "parents": [
        "2ca0dcaf432fc4ceffbd40178be860780bd09f9b",
        "827613055e29c5943296acb3c36c92b041f436fb"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed Sep 12 03:09:28 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Sep 12 03:09:28 2018 +0000"
      },
      "message": "Merge \"MediaPlayer2: remove unused code setMetadataFilter and getMetadata\""
    },
    {
      "commit": "2ca0dcaf432fc4ceffbd40178be860780bd09f9b",
      "tree": "5b8946540ce7da3856c8f5797ff0089df14ee410",
      "parents": [
        "6b5aebe69f5db1c758a192a464dac1f0000dd060",
        "dfb411f91668972faddfc3d175bd3c95ce29673e"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed Sep 12 01:18:28 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Sep 12 01:18:28 2018 +0000"
      },
      "message": "Merge \"Audioflinger: Dump \"master mute\" state in threads\""
    },
    {
      "commit": "6b5aebe69f5db1c758a192a464dac1f0000dd060",
      "tree": "fd26f6283cbcc7a64a264320fd1ee9b64df7a992",
      "parents": [
        "4622878b8f7f47f6b9ae41135f9a6d909a5fccdf",
        "b0688d699b8c2f406e001a5c991f3e0515c84ab9"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Sep 11 23:10:11 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Sep 11 23:10:11 2018 +0000"
      },
      "message": "Merge changes I3f135b98,Ifadb1d24,Ieef3e05d,Id342c224\n\n* changes:\n  audio policy: fix getDevicesForStream() with preferred route\n  audiopolicy: refactor playback activity ref counting\n  audio policy: remove AudioSession class\n  audio policy: refactor preferred route implementation\n"
    },
    {
      "commit": "dfb411f91668972faddfc3d175bd3c95ce29673e",
      "tree": "df481e8f5dc63df36dc8a469d6e248383f9beba1",
      "parents": [
        "aec9c3e4b573862dacb4b4cec4c87cf736a3a28e"
      ],
      "author": {
        "name": "Mikhail Naganov",
        "email": "mnaganov@google.com",
        "time": "Tue Sep 11 13:39:56 2018 -0700"
      },
      "committer": {
        "name": "Mikhail Naganov",
        "email": "mnaganov@google.com",
        "time": "Tue Sep 11 13:39:56 2018 -0700"
      },
      "message": "Audioflinger: Dump \"master mute\" state in threads\n\n\"Master mute\" which can be toggled on via \"ro.audio.silent\" property\nhas user-hearable effect, but is not reflected in the dumpsys.\nThis can cause confusion (see the bug referenced).\n\nNote that we need to dump PlaybackThread::mMasterMute, not\nAudioFlinger::mMasterMute, as the latter does not get updated\nby threads in order to avoid taking a lock.\n\nBug: 113348789\nTest: toggle property, check media.audio_flinger dump\nChange-Id: I7f276b233df2f5eca585ffb30031835c030858e1\n"
    },
    {
      "commit": "827613055e29c5943296acb3c36c92b041f436fb",
      "tree": "8a7130d4b905f3ec744b801155d2afaf14db3703",
      "parents": [
        "4622878b8f7f47f6b9ae41135f9a6d909a5fccdf"
      ],
      "author": {
        "name": "Dongwon Kang",
        "email": "dwkang@google.com",
        "time": "Tue Sep 11 10:42:17 2018 -0700"
      },
      "committer": {
        "name": "Dongwon Kang",
        "email": "dwkang@google.com",
        "time": "Tue Sep 11 13:22:42 2018 -0700"
      },
      "message": "MediaPlayer2: remove unused code setMetadataFilter and getMetadata\n\n1. These are dead codes since there is not entry points in the\n   MediaPlayer2[Impl].java side.\n2. In MP1, setMetadataFilter() and getMetadata() has been hidden\n   from the beginning. Ic20240a0b388897950c98337b539eb05e487273a\n   And, even the Metadata class is deprecated in favor of MediaMetadata.\n\nTest: build\nBug: 112767225\n\nChange-Id: Ia76ca34faf45ca03d04b8599e312e87ea4a3486b\n"
    },
    {
      "commit": "4622878b8f7f47f6b9ae41135f9a6d909a5fccdf",
      "tree": "c5848be586c03b5ed9a9fd9b051b62f1f2566c4b",
      "parents": [
        "5fcd6ca5e4811a1a0b7606debe94a23b489bbae4",
        "a0e816ac2a7b1394774776f334de9e066367ecc0"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Tue Sep 11 19:26:44 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Sep 11 19:26:44 2018 +0000"
      },
      "message": "Merge changes from topics \"timedtext\", \"noti\"\n\n* changes:\n  MediaPlayer2: use protobuf instead of parcel for TimedText\n  MediaPlayer2: use protobuf instead of parcel for notification message\n"
    },
    {
      "commit": "5fcd6ca5e4811a1a0b7606debe94a23b489bbae4",
      "tree": "2815428e70f9f08936332ccbb1d2801dfbd0b900",
      "parents": [
        "55071964900997e3bc4a47a931839829e3665028",
        "d6eee717dffdd8ee5c9dabaed80940d6838c47b9"
      ],
      "author": {
        "name": "Eric Tan",
        "email": "taneric@google.com",
        "time": "Tue Sep 11 19:24:41 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Sep 11 19:24:41 2018 +0000"
      },
      "message": "Merge changes I9b1538a8,Ib6ea9676\n\n* changes:\n  periodically push AudioFlinger thread statistics to media metrics\n  NBLog: log and store warmup times, underruns, overruns, and thread info\n"
    },
    {
      "commit": "a0e816ac2a7b1394774776f334de9e066367ecc0",
      "tree": "080b46a69cc83fa8c8c1a1bca1b0938a38bd82ee",
      "parents": [
        "41929fb5f625b80fe5a492fdef3456a74987001e"
      ],
      "author": {
        "name": "Dongwon Kang",
        "email": "dwkang@google.com",
        "time": "Mon Sep 10 19:46:49 2018 -0700"
      },
      "committer": {
        "name": "Dongwon Kang",
        "email": "dwkang@google.com",
        "time": "Mon Sep 10 23:15:09 2018 -0700"
      },
      "message": "MediaPlayer2: use protobuf instead of parcel for TimedText\n\nTest: MediaPlayer2Test\nBug: 112767225\nChange-Id: I3f6b06d49b2a245e8350d792c01bccb9fd44037f\n"
    },
    {
      "commit": "41929fb5f625b80fe5a492fdef3456a74987001e",
      "tree": "5a93bbf9a5b0d49b0ce982ac4d673dc7b1390a10",
      "parents": [
        "55071964900997e3bc4a47a931839829e3665028"
      ],
      "author": {
        "name": "Dongwon Kang",
        "email": "dwkang@google.com",
        "time": "Sun Sep 09 08:29:56 2018 -0700"
      },
      "committer": {
        "name": "Dongwon Kang",
        "email": "dwkang@google.com",
        "time": "Mon Sep 10 20:39:52 2018 -0700"
      },
      "message": "MediaPlayer2: use protobuf instead of parcel for notification message\n\nTest: MediaPlayer2Test\nBug: 112767225\nChange-Id: I7f5bd177c138a8ad5c005f4505d4d9c5042486a8\n"
    },
    {
      "commit": "d6eee717dffdd8ee5c9dabaed80940d6838c47b9",
      "tree": "6a53b00842bcb183636f4ceef0f3ea90ffd9f1d8",
      "parents": [
        "fefe316501e06c96ce0d905c793b4d872d60e976"
      ],
      "author": {
        "name": "Eric Tan",
        "email": "taneric@google.com",
        "time": "Fri Sep 07 10:58:19 2018 -0700"
      },
      "committer": {
        "name": "Eric Tan",
        "email": "taneric@google.com",
        "time": "Mon Sep 10 19:05:15 2018 -0700"
      },
      "message": "periodically push AudioFlinger thread statistics to media metrics\n\nTest: dumpsys media.metrics\nBug: 68148948\nChange-Id: I9b1538a8cff3f89f4689dceda800132349338a0d\n"
    },
    {
      "commit": "fefe316501e06c96ce0d905c793b4d872d60e976",
      "tree": "cd6bb858c1de4d0bba5d7a321a5db065247fc3fc",
      "parents": [
        "bc2a77308b7c197a30a3289e5b75d0f089e65982"
      ],
      "author": {
        "name": "Eric Tan",
        "email": "taneric@google.com",
        "time": "Fri Sep 07 10:09:11 2018 -0700"
      },
      "committer": {
        "name": "Eric Tan",
        "email": "taneric@google.com",
        "time": "Mon Sep 10 19:05:08 2018 -0700"
      },
      "message": "NBLog: log and store warmup times, underruns, overruns, and thread info\n\nTest: dumpsys media.log\nBug: 68148948\n\nChange-Id: Ib6ea96760f7886cba47c8e2f0334114237a2434b\n"
    },
    {
      "commit": "55071964900997e3bc4a47a931839829e3665028",
      "tree": "46fba37b40789e76399ca5cf1d23c72a6759da19",
      "parents": [
        "dd6f1835aa352c167d04f4280289988faed7f590",
        "bc2a77308b7c197a30a3289e5b75d0f089e65982"
      ],
      "author": {
        "name": "Eric Tan",
        "email": "taneric@google.com",
        "time": "Mon Sep 10 21:34:31 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Sep 10 21:34:31 2018 +0000"
      },
      "message": "Merge \"media.metrics: add new record type \"audiothread\"\""
    },
    {
      "commit": "b0688d699b8c2f406e001a5c991f3e0515c84ab9",
      "tree": "0b2444fe7f07c79f9cda5a683303e6cd52961564",
      "parents": [
        "592dd7bf150cee7990958632425c411366252083"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Tue Aug 14 15:49:18 2018 -0700"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon Sep 10 14:07:45 2018 -0700"
      },
      "message": "audio policy: fix getDevicesForStream() with preferred route\n\nFix getDevicesForStream() to return correct device when the stream\nis active with an explicit preferred device selection.\n\nTest: manual test with AudioExplicitRouting app.\nChange-Id: I3f135b98b50c570ac7123c723f195da64a2d1e20\n"
    },
    {
      "commit": "592dd7bf150cee7990958632425c411366252083",
      "tree": "4cee35a646c148839ed4839a96d03a2464b425ba",
      "parents": [
        "8f42ea1fd1c813d9ed97ade72d7514e883cf7cb9"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Sun Aug 05 18:58:48 2018 -0700"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon Sep 10 14:07:45 2018 -0700"
      },
      "message": "audiopolicy: refactor playback activity ref counting\n\nPlayback activity ref couting is now based on active state\nof PlaybackClientDescriptor.\n\nThe active reference count per stream on each output is still\nused because it provides a simple implementation for duplicated output.\n\nTest: CTS tests for AudioTrack and Routing\nTest: manual audio smoke test\n\nChange-Id: Ifadb1d24131581461aace14a5b25e7c7582c57cb\n"
    },
    {
      "commit": "8f42ea1fd1c813d9ed97ade72d7514e883cf7cb9",
      "tree": "4a6c16fd8b856a10fd122170d55a93899cc2613c",
      "parents": [
        "97ac871cd4f075b3d4b47557a81e9e05ad7762ec"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Wed Aug 08 09:08:25 2018 -0700"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon Sep 10 14:07:45 2018 -0700"
      },
      "message": "audio policy: remove AudioSession class\n\nNow that clients are tracked individually, tracking by\naudio session is no needed anymore.\nModify management of client activity, preempted sound trigger\nsessions and silenced uids to rely on RecordClientDescriptor\ninstead of AudioSession.\n\nTest: CTS test for AudioRecord\nTest: manual capture audio tests for all use cases\n\nChange-Id: Ieef3e05daea98aec9320412393f912bd6bd7e046\n"
    },
    {
      "commit": "97ac871cd4f075b3d4b47557a81e9e05ad7762ec",
      "tree": "a6a547e02e4d736e45f275b4c93c2576ef30e675",
      "parents": [
        "dd6f1835aa352c167d04f4280289988faed7f590"
      ],
      "author": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Fri Jul 27 18:59:02 2018 -0700"
      },
      "committer": {
        "name": "Eric Laurent",
        "email": "elaurent@google.com",
        "time": "Mon Sep 10 14:07:45 2018 -0700"
      },
      "message": "audio policy: refactor preferred route implementation\n\nRemove SessionRoute class and replace by use of\npreferredDevice and active state in ClientDescriptor\n\nAlso fix the behavior for other clients using same strategy as\nclient with preferred route: the preferred route is only used if\nno other clients using the same strategy are active without a preferred\nroute.\nIf all clients have a preferred route, the route of the last active\nclient is used.\n\nAlso fixed getOutputForAttr() to return correct selected device ID when\ndynamic policies are used.\n\nTest: CTS RoutingTest, AudioPlayRoutingNative, AudioRecordRoutingNative\nTest: Manual: AudioExplicitRouting, UplinkMusicSampleApp\n\nChange-Id: Id342c2241ace3e1a359ea74f4a539a395f793b86\n"
    },
    {
      "commit": "dd6f1835aa352c167d04f4280289988faed7f590",
      "tree": "00742344a9c7d3adb1b8a240f590be7feb815c10",
      "parents": [
        "0127c1be07d63e046e136126cd465c3fa8977768",
        "9f6319815f0dea99268530f1fd0d0f4f299f7eee"
      ],
      "author": {
        "name": "Dongwon Kang",
        "email": "dwkang@google.com",
        "time": "Mon Sep 10 18:32:32 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Sep 10 18:32:32 2018 +0000"
      },
      "message": "Merge \"MediaPlayer2: use protobuf instead of parcel in invoke()\""
    },
    {
      "commit": "0127c1be07d63e046e136126cd465c3fa8977768",
      "tree": "4eb611ec5d010becd3583f93c640cc9468acb3b3",
      "parents": [
        "fdfae2898f0785f19de198ed00488e03bf52bca9"
      ],
      "author": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Thu Mar 29 13:48:06 2018 -0700"
      },
      "committer": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Fri Sep 07 11:08:24 2018 -0700"
      },
      "message": "aaudio: use new flowgraph to simplify processing\n\nConstruct a flowgraph based on the source and destination\nformat and channelCount. This is groundwork for supporting 24-bit\nPCM formats.\n\nAlso cleaned up handling of device related format.\n\nThis CL removes more code than it adds.\n\nBug: 65067568\nTest: write_sine_callback.cpp -pl\nTest: write_sine_callback.cpp -pl -x\nTest: input_monitor -pl\nTest: input_monitor -pl -x\nChange-Id: Ia155bff0164912011d09b61b54f983ccf4490bd1\n"
    },
    {
      "commit": "fdfae2898f0785f19de198ed00488e03bf52bca9",
      "tree": "fcade8a0652301730dd91e8be98172edf9e1ae7a",
      "parents": [
        "3610f74e60e2c253d238fd6687e24dedc76a2b72",
        "07d947d648dffe73b826596a92622754f9d303fd"
      ],
      "author": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Thu Sep 06 21:41:40 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Sep 06 21:41:40 2018 -0700"
      },
      "message": "[automerger skipped] Merge changes from topic \"b113052379-cp-from-pi-dev-p2\" am: 79b9d483d3 am: ff717cac49  -s ours\nam: 07d947d648  -s ours\n\nChange-Id: Ia0041b4c6ee3df49b16ec69ed636039950c2e2b3\n"
    },
    {
      "commit": "bc2a77308b7c197a30a3289e5b75d0f089e65982",
      "tree": "0ecd2a56a618c280fb7bb430ef143c4af66cb173",
      "parents": [
        "8d4991797071989e51b08dd58cbe2635ef544f95"
      ],
      "author": {
        "name": "Eric Tan",
        "email": "taneric@google.com",
        "time": "Thu Sep 06 12:04:44 2018 -0700"
      },
      "committer": {
        "name": "Eric Tan",
        "email": "taneric@google.com",
        "time": "Thu Sep 06 18:17:52 2018 -0700"
      },
      "message": "media.metrics: add new record type \"audiothread\"\n\nTest: compile\nBug: 68148948\n\nChange-Id: I8cf96fdc218bd09d90916f2c96fa343ddd4f873b\n"
    },
    {
      "commit": "3610f74e60e2c253d238fd6687e24dedc76a2b72",
      "tree": "fcade8a0652301730dd91e8be98172edf9e1ae7a",
      "parents": [
        "d43d6a0b9425634141a12d09518e353d1e0a1484",
        "bb78a73db83955151feb6b150f7cb925bcabe79a"
      ],
      "author": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Fri Sep 07 00:36:25 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Sep 07 00:36:25 2018 +0000"
      },
      "message": "Merge changes I7d7794fd,I81a56554\n\n* changes:\n  aaudio test: test flowgraph\n  aaudio: add simple flowgraph system\n"
    },
    {
      "commit": "d43d6a0b9425634141a12d09518e353d1e0a1484",
      "tree": "0a3229c2c9cbe39e2e277bb9532acb5c05661fb8",
      "parents": [
        "dbb37e532e5528a8726ee3c05537300a67c51be7",
        "c34b9b7ceb590d31a1ffb50e30f310fb76e81c66"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Fri Sep 07 00:17:22 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Sep 07 00:17:22 2018 +0000"
      },
      "message": "Merge \"bufferpool2.0 tests: add read/write verification\""
    },
    {
      "commit": "dbb37e532e5528a8726ee3c05537300a67c51be7",
      "tree": "dea1746440a364c64205c5406bb9754bf1bf5282",
      "parents": [
        "a87a219b7eae100aa76c9bc045189e1cbb392c8f",
        "1cb0ccb5b9ce176949fcd09460d58680d9f3382e"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Fri Sep 07 00:16:51 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Sep 07 00:16:51 2018 +0000"
      },
      "message": "Merge \"bufferpool2.0: apply hidl interface update\""
    },
    {
      "commit": "c34b9b7ceb590d31a1ffb50e30f310fb76e81c66",
      "tree": "26c8b53e8473a2f1cb0bd2948a9723b1b3b78667",
      "parents": [
        "1cb0ccb5b9ce176949fcd09460d58680d9f3382e"
      ],
      "author": {
        "name": "Sungtak Lee",
        "email": "taklee@google.com",
        "time": "Thu Sep 06 14:48:21 2018 -0700"
      },
      "committer": {
        "name": "Sungtak Lee",
        "email": "taklee@google.com",
        "time": "Thu Sep 06 15:19:50 2018 -0700"
      },
      "message": "bufferpool2.0 tests: add read/write verification\n\nBug: 112203066\nBug: 113798958\nChange-Id: I3969903c7263654bf1fecf012cf9185acd60ef58\n"
    },
    {
      "commit": "a87a219b7eae100aa76c9bc045189e1cbb392c8f",
      "tree": "feeee31cfc3dfefa56ced6605b162fd78e7fd57f",
      "parents": [
        "8d4991797071989e51b08dd58cbe2635ef544f95",
        "6a59e4ae385b15bb3ef729b62bb34933ce3ce18d"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Thu Sep 06 21:49:55 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Sep 06 21:49:55 2018 +0000"
      },
      "message": "Merge \"NdkMediaExtractor: setDataSourceWithHeaders API\""
    },
    {
      "commit": "07d947d648dffe73b826596a92622754f9d303fd",
      "tree": "3a59eda1afe3fb0e93b666f8bcd7e7c6bd894935",
      "parents": [
        "8c927dfd46e5d7952e036cb8360c9e583d79d694",
        "ff717cac4905e40bb4adbefb49017bc55b36eca6"
      ],
      "author": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Thu Sep 06 14:42:34 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Sep 06 14:42:34 2018 -0700"
      },
      "message": "[automerger skipped] Merge changes from topic \"b113052379-cp-from-pi-dev-p2\" am: 79b9d483d3\nam: ff717cac49  -s ours\n\nChange-Id: I11bf06c92d000b52cc9ab6f1cb48098ad1650122\n"
    },
    {
      "commit": "ff717cac4905e40bb4adbefb49017bc55b36eca6",
      "tree": "32c92e271258cf710dd23b6b6c1d72371083bca5",
      "parents": [
        "cdca8b4205c396af4ed2746e096837b753696934",
        "79b9d483d346fc2c2bd680c2154569adf199f26b"
      ],
      "author": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Thu Sep 06 14:23:54 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Sep 06 14:23:54 2018 -0700"
      },
      "message": "Merge changes from topic \"b113052379-cp-from-pi-dev-p2\"\nam: 79b9d483d3\n\nChange-Id: Ie33e09892b21aee2a1310ded541d04f8f4d2480c\n"
    },
    {
      "commit": "79b9d483d346fc2c2bd680c2154569adf199f26b",
      "tree": "2f0ef31dde5cb76147600ba4a7c357e88cf25707",
      "parents": [
        "311d0133a4b2f3156026ba318cb9bb1e7cbe5e73",
        "97258dc211b68978b4f74e114c113a6482e7e89b"
      ],
      "author": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Thu Sep 06 20:35:24 2018 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Thu Sep 06 20:35:24 2018 +0000"
      },
      "message": "Merge changes from topic \"b113052379-cp-from-pi-dev-p2\"\n\n* changes:\n  Camera: Documentation update to remove physicalIds\n  Camera: Documentation updates for calibration and distortion correction\n  Fix NdkImage.h includes\n  Restore __ANDROID_API__ guards for camera/media headers\n  Remove __INTRODUCED_IN from a typedef\n"
    },
    {
      "commit": "8d4991797071989e51b08dd58cbe2635ef544f95",
      "tree": "e62e0737c70dbb8f74d9f3d3e680377c570395ff",
      "parents": [
        "5f3ff7e38fc46096e828839b28c06bfa111eb25f",
        "0f6e640075173b76c3925f2cf92d9faf5ce8caba"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu Sep 06 19:28:45 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Sep 06 19:28:45 2018 +0000"
      },
      "message": "Merge \"AudioPolicyManager: Update property get\""
    },
    {
      "commit": "0f6e640075173b76c3925f2cf92d9faf5ce8caba",
      "tree": "e0b4dc6b94fd7f516b411e1fdbd6f115d772a083",
      "parents": [
        "9d83f9d405290b952ba519213eeef918df2b2a76"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Thu Sep 06 11:20:45 2018 -0700"
      },
      "committer": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Thu Sep 06 11:21:22 2018 -0700"
      },
      "message": "AudioPolicyManager: Update property get\n\nUse built-in prop_get_bool and prop_get_int32 for consistent behavior.\n\nTest: Play Music and disable offload\nChange-Id: I0a76430ceffadac529c193f3b19b5dd1cd7aa467\n"
    },
    {
      "commit": "6a59e4ae385b15bb3ef729b62bb34933ce3ce18d",
      "tree": "1b9a54063e01208ae2965c405a840ff64073a260",
      "parents": [
        "e8198ce2bb3d27604dee02299c9de7117124cad2"
      ],
      "author": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Thu Aug 30 13:31:28 2018 -0700"
      },
      "committer": {
        "name": "Robert Shih",
        "email": "robertshih@google.com",
        "time": "Thu Sep 06 11:07:04 2018 -0700"
      },
      "message": "NdkMediaExtractor: setDataSourceWithHeaders API\n\nBug: 109928575\nChange-Id: I90e9f6c9d6408f5c577ba75c9792bed589cee304\n"
    },
    {
      "commit": "1cb0ccb5b9ce176949fcd09460d58680d9f3382e",
      "tree": "b9f66d972b8ff198a7e096f75e21810248ece398",
      "parents": [
        "d4a9ce4ba72280b7f3833446925f0bf6e42e1112"
      ],
      "author": {
        "name": "Sungtak Lee",
        "email": "taklee@google.com",
        "time": "Wed Sep 05 14:47:36 2018 -0700"
      },
      "committer": {
        "name": "Sungtak Lee",
        "email": "taklee@google.com",
        "time": "Thu Sep 06 10:40:41 2018 -0700"
      },
      "message": "bufferpool2.0: apply hidl interface update\n\nBug: 112203066\nChange-Id: I2f797f72c34d923f4b9efa5cf6eefad468458233\n"
    },
    {
      "commit": "5f3ff7e38fc46096e828839b28c06bfa111eb25f",
      "tree": "b6b0e28ceeb7a701f27a94c7852d234a00fc0a5a",
      "parents": [
        "9d83f9d405290b952ba519213eeef918df2b2a76",
        "71115426b8befebf56d56a438c38c4f1da00d121"
      ],
      "author": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Thu Sep 06 17:23:14 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Sep 06 17:23:14 2018 +0000"
      },
      "message": "Merge \"stagefright: Handle DEAD_OBJECT correctly in conversion\""
    },
    {
      "commit": "9d83f9d405290b952ba519213eeef918df2b2a76",
      "tree": "650470e0021eaf223fbb268bbecf9e0157eaaf35",
      "parents": [
        "a8e8fe5655b0fbc9b0b04d153c69a4df75941f34",
        "f0c4a6b5cd282b7cdb19205bdcea4572d47c23e1"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu Sep 06 15:55:07 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Sep 06 15:55:07 2018 +0000"
      },
      "message": "Merge \"Camera: Treat decreasing timestamp as BUFFER_ERROR\""
    },
    {
      "commit": "a8e8fe5655b0fbc9b0b04d153c69a4df75941f34",
      "tree": "eacdd2f96287b41aeacad3fbc975cb260e46abcc",
      "parents": [
        "752c7cfc96f1a6ca0f16e0b4d9962c35cbe0e88a",
        "8c927dfd46e5d7952e036cb8360c9e583d79d694"
      ],
      "author": {
        "name": "Sungtak Lee",
        "email": "taklee@google.com",
        "time": "Wed Sep 05 23:47:21 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 05 23:47:21 2018 -0700"
      },
      "message": "Merge \"NuPlayer2CCDecoder: Add bound check before memcpy\" into pi-dev am: e2062af59c\nam: 8c927dfd46\n\nChange-Id: I4cebf0a044c6b4e53cc95df93b9fb0007a4979b0\n"
    },
    {
      "commit": "752c7cfc96f1a6ca0f16e0b4d9962c35cbe0e88a",
      "tree": "eacdd2f96287b41aeacad3fbc975cb260e46abcc",
      "parents": [
        "d4a9ce4ba72280b7f3833446925f0bf6e42e1112",
        "f4942d7989993b8d82010dd1047a4c68d625b324"
      ],
      "author": {
        "name": "Shingo Kitajima",
        "email": "shingo.x.kitajima@sony.com",
        "time": "Wed Sep 05 23:42:52 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 05 23:42:52 2018 -0700"
      },
      "message": "Merge \"Allow volume setting only for offloadable effect for Offload\" am: 311d0133a4 am: cdca8b4205\nam: f4942d7989\n\nChange-Id: I47468b938913f77e68a7bde41105b4c92a57f58d\n"
    },
    {
      "commit": "8c927dfd46e5d7952e036cb8360c9e583d79d694",
      "tree": "3a59eda1afe3fb0e93b666f8bcd7e7c6bd894935",
      "parents": [
        "f4942d7989993b8d82010dd1047a4c68d625b324",
        "e2062af59cc21ab42a6db554463b5b4b6ed9509a"
      ],
      "author": {
        "name": "Sungtak Lee",
        "email": "taklee@google.com",
        "time": "Wed Sep 05 21:57:15 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 05 21:57:15 2018 -0700"
      },
      "message": "Merge \"NuPlayer2CCDecoder: Add bound check before memcpy\" into pi-dev\nam: e2062af59c\n\nChange-Id: I7d0b0d3725426f968952642ab85aaf74cf05b218\n"
    },
    {
      "commit": "f4942d7989993b8d82010dd1047a4c68d625b324",
      "tree": "cfb1e816067fb5b8d64ad68107c893e42dab60d3",
      "parents": [
        "3506f424aeb19db7bf6bbb17f0a80d61d119cc2b",
        "cdca8b4205c396af4ed2746e096837b753696934"
      ],
      "author": {
        "name": "Shingo Kitajima",
        "email": "shingo.x.kitajima@sony.com",
        "time": "Wed Sep 05 21:12:00 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 05 21:12:00 2018 -0700"
      },
      "message": "Merge \"Allow volume setting only for offloadable effect for Offload\" am: 311d0133a4\nam: cdca8b4205\n\nChange-Id: Ib96e1ff3d57b13834f311455bd491b1956322c30\n"
    },
    {
      "commit": "cdca8b4205c396af4ed2746e096837b753696934",
      "tree": "966e089d0590f2d28bdb87dda4cb7c4ae446f00a",
      "parents": [
        "649ac89590a610b13caf4e94f1c2a417b7c90a80",
        "311d0133a4b2f3156026ba318cb9bb1e7cbe5e73"
      ],
      "author": {
        "name": "Shingo Kitajima",
        "email": "shingo.x.kitajima@sony.com",
        "time": "Wed Sep 05 20:42:55 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 05 20:42:55 2018 -0700"
      },
      "message": "Merge \"Allow volume setting only for offloadable effect for Offload\"\nam: 311d0133a4\n\nChange-Id: Ic4b17b863c4d1f523adb9b75b21d6f1beb925120\n"
    },
    {
      "commit": "e2062af59cc21ab42a6db554463b5b4b6ed9509a",
      "tree": "d54a8f6abca0694cfbee1f3564eee63160fcf235",
      "parents": [
        "11f23b2478131792e626d4297700c526e05d5a90",
        "e96c64a0d21d1ab2c9ba9726766fd8432462888a"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu Sep 06 01:55:15 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Sep 06 01:55:15 2018 +0000"
      },
      "message": "Merge \"NuPlayer2CCDecoder: Add bound check before memcpy\" into pi-dev"
    },
    {
      "commit": "311d0133a4b2f3156026ba318cb9bb1e7cbe5e73",
      "tree": "20424d51aad87e0ae87feb31b6f91bce5f6ce1f2",
      "parents": [
        "7b95c4c042eabd256109399a2065bdb36047e461",
        "1f8df9ae201bc4405aed068c910b08dc5458864f"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu Sep 06 00:46:52 2018 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Thu Sep 06 00:46:52 2018 +0000"
      },
      "message": "Merge \"Allow volume setting only for offloadable effect for Offload\""
    },
    {
      "commit": "71115426b8befebf56d56a438c38c4f1da00d121",
      "tree": "784b6da02ee675d89978c574b48273ea6327533e",
      "parents": [
        "d4a9ce4ba72280b7f3833446925f0bf6e42e1112"
      ],
      "author": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Wed Sep 05 09:50:55 2018 -0700"
      },
      "committer": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Wed Sep 05 14:07:42 2018 -0700"
      },
      "message": "stagefright: Handle DEAD_OBJECT correctly in conversion\n\nBug: 113343878\nTest: bug repro step\nChange-Id: Iab66ae73a8e57d11bd6979a299377711d2f83d93\n"
    },
    {
      "commit": "f0c4a6b5cd282b7cdb19205bdcea4572d47c23e1",
      "tree": "03cd37bc313b1065301fe46defd683e96153f7fd",
      "parents": [
        "89e319f74c394a59f180e88cc57e0afd9993a0a4"
      ],
      "author": {
        "name": "Shuzhen Wang",
        "email": "shuzhenwang@google.com",
        "time": "Wed Sep 05 09:36:14 2018 -0700"
      },
      "committer": {
        "name": "Shuzhen Wang",
        "email": "shuzhenwang@google.com",
        "time": "Wed Sep 05 13:33:53 2018 -0700"
      },
      "message": "Camera: Treat decreasing timestamp as BUFFER_ERROR\n\nDecreasing timestamp shouldn\u0027t happen in non ZSL or reprocessing case.\nWhen that happens, treat the buffer as error and return to buffer queue\ndirectly.\n\nTest: Camera CTS\nBug: 113670946\nChange-Id: I39d3417dd9307d6cc7c90ff357a82604566a9081\n"
    },
    {
      "commit": "d4a9ce4ba72280b7f3833446925f0bf6e42e1112",
      "tree": "22a7c09fc0e7f927d873b2652af37ecb95470e1c",
      "parents": [
        "f4ff42947da3f996a51f01891f563a2af0fa26d4",
        "0a07d65edfe43bae713e316babc2d419e6fed816"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed Sep 05 19:13:13 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Sep 05 19:13:13 2018 +0000"
      },
      "message": "Merge \"stagefright: add TEST_MAPPING\""
    },
    {
      "commit": "f4ff42947da3f996a51f01891f563a2af0fa26d4",
      "tree": "f47a42c781b2cdb021391d3e12f17a3d26207abd",
      "parents": [
        "c3c67567b35fe780e18255d66fdd3ec3284fcb94",
        "15f97c996f29c780f52fe3504fabd08dbde066ba"
      ],
      "author": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Wed Sep 05 18:59:37 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Sep 05 18:59:37 2018 +0000"
      },
      "message": "Merge \"aaudio: set to SHARED when EXCLUSIVE fails\""
    },
    {
      "commit": "c3c67567b35fe780e18255d66fdd3ec3284fcb94",
      "tree": "fe2924689cf418f419f31c4f671132a58171fb1b",
      "parents": [
        "3db05287ccfda65b96685a52a7fbfa872b1c9383",
        "3506f424aeb19db7bf6bbb17f0a80d61d119cc2b"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Sep 05 11:36:00 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 05 11:36:00 2018 -0700"
      },
      "message": "[automerger skipped] Fix race condition for cas sessions -- DO NOT MERGE am: c927af1287 am: ebbcb99ca1  -s ours am: c61b35c29b  -s ours am: 11f23b2478\nam: 3506f424ae  -s ours\n\nChange-Id: I81afb05d98740d5bb2717581e5c3ba51f26e9a29\n"
    },
    {
      "commit": "3506f424aeb19db7bf6bbb17f0a80d61d119cc2b",
      "tree": "b16c858384cb8fe747b426d3c4bec49190f68e52",
      "parents": [
        "dc5fdba156c6a4594b69674d6fcd8cdd01f1d1f0",
        "11f23b2478131792e626d4297700c526e05d5a90"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Sep 05 11:29:26 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 05 11:29:26 2018 -0700"
      },
      "message": "[automerger skipped] Fix race condition for cas sessions -- DO NOT MERGE am: c927af1287 am: ebbcb99ca1  -s ours am: c61b35c29b  -s ours\nam: 11f23b2478\n\nChange-Id: I1ae4220d4a9e32101ade3d450027aec82e431170\n"
    },
    {
      "commit": "11f23b2478131792e626d4297700c526e05d5a90",
      "tree": "6f8cba4a481eb17b7a40c62145c0e8473e3bb8b6",
      "parents": [
        "21b41481291baa7a9294336f6ef334ea84613530",
        "c61b35c29bd6e7fc79bb0117b57635518fa5aa51"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Sep 05 11:19:47 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 05 11:19:47 2018 -0700"
      },
      "message": "[automerger skipped] Fix race condition for cas sessions -- DO NOT MERGE am: c927af1287 am: ebbcb99ca1  -s ours\nam: c61b35c29b  -s ours\n\nChange-Id: Iaa6df9ed55006544542adb17223a3ca79de9010c\n"
    },
    {
      "commit": "3db05287ccfda65b96685a52a7fbfa872b1c9383",
      "tree": "fe2924689cf418f419f31c4f671132a58171fb1b",
      "parents": [
        "68c075bab3d2ca3b531a758a813dab553b988be7",
        "dc5fdba156c6a4594b69674d6fcd8cdd01f1d1f0"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Sep 05 11:15:44 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 05 11:15:44 2018 -0700"
      },
      "message": "[automerger skipped] Fix race condition for cas sessions -- DO NOT MERGE am: 58b9e7d73c  -s ours am: 21b4148129\nam: dc5fdba156  -s ours\n\nChange-Id: Id76725ecbab1d50b4d12f0b5c8fbf93d8ee56a6b\n"
    },
    {
      "commit": "68c075bab3d2ca3b531a758a813dab553b988be7",
      "tree": "fe2924689cf418f419f31c4f671132a58171fb1b",
      "parents": [
        "72882de6e16efb89ddfdb166917a91fff95325da",
        "5b22bf738a5a40688f019e0e37625074a5374ade"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Sep 05 11:13:45 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 05 11:13:45 2018 -0700"
      },
      "message": "Fix race condition for cas sessions am: 7934a8f7ee\nam: 5b22bf738a\n\nChange-Id: Id82a4cb94894c0a996c194391dd7c2ff09a1c23a\n"
    },
    {
      "commit": "c61b35c29bd6e7fc79bb0117b57635518fa5aa51",
      "tree": "a5cf1d0fbf13f2b0e4f29d04ee9636ae7e26fbad",
      "parents": [
        "58b9e7d73c9e2a7a7ff11a4584fd1e1105669831",
        "ebbcb99ca11fb09a39900da010f30e7ca8b7db30"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Sep 05 11:13:02 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 05 11:13:02 2018 -0700"
      },
      "message": "[automerger skipped] Fix race condition for cas sessions -- DO NOT MERGE am: c927af1287\nam: ebbcb99ca1  -s ours\n\nChange-Id: Ic07e59b4c05abcc70018d912a8f0cabd52cbf3a5\n"
    },
    {
      "commit": "dc5fdba156c6a4594b69674d6fcd8cdd01f1d1f0",
      "tree": "b16c858384cb8fe747b426d3c4bec49190f68e52",
      "parents": [
        "5b22bf738a5a40688f019e0e37625074a5374ade",
        "21b41481291baa7a9294336f6ef334ea84613530"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Sep 05 11:07:25 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 05 11:07:25 2018 -0700"
      },
      "message": "[automerger skipped] Fix race condition for cas sessions -- DO NOT MERGE am: 58b9e7d73c  -s ours\nam: 21b4148129\n\nChange-Id: Iacfebbfe9f0a823f2ae9b96f7dded8d6158af446\n"
    },
    {
      "commit": "5b22bf738a5a40688f019e0e37625074a5374ade",
      "tree": "b16c858384cb8fe747b426d3c4bec49190f68e52",
      "parents": [
        "7d313b3fd19dabc52ecce313b18c79d8cd253383",
        "7934a8f7ee0988b181980b9e6f24ca7dd357f5e3"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Sep 05 11:06:40 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 05 11:06:40 2018 -0700"
      },
      "message": "Fix race condition for cas sessions\nam: 7934a8f7ee\n\nChange-Id: I6e69d66fdc036d90ec28225080a02ace369d9fb3\n"
    },
    {
      "commit": "ebbcb99ca11fb09a39900da010f30e7ca8b7db30",
      "tree": "7e623681475d9a69770ad7d49700d96565767683",
      "parents": [
        "feeda6ddb0bc57eddb2d4468dc478ab6ac5ef1cb",
        "c927af1287e3b90d77e40aae26f4a3b61de3ac09"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Sep 05 11:05:48 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 05 11:05:48 2018 -0700"
      },
      "message": "Fix race condition for cas sessions -- DO NOT MERGE\nam: c927af1287\n\nChange-Id: I1c84f2fd3d49a7e784b2b44d20453796d070df8d\n"
    },
    {
      "commit": "21b41481291baa7a9294336f6ef334ea84613530",
      "tree": "6f8cba4a481eb17b7a40c62145c0e8473e3bb8b6",
      "parents": [
        "7934a8f7ee0988b181980b9e6f24ca7dd357f5e3",
        "58b9e7d73c9e2a7a7ff11a4584fd1e1105669831"
      ],
      "author": {
        "name": "Chong Zhang",
        "email": "chz@google.com",
        "time": "Wed Sep 05 10:57:32 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Sep 05 10:57:32 2018 -0700"
      },
      "message": "[automerger skipped] Fix race condition for cas sessions -- DO NOT MERGE\nam: 58b9e7d73c  -s ours\n\nChange-Id: I040e0c5c5fba533a5b49ffe0aaa8008cfcc2c240\n"
    },
    {
      "commit": "0a07d65edfe43bae713e316babc2d419e6fed816",
      "tree": "4f96f642d8b6730ed0ff6c09ee54d8e2ee166de8",
      "parents": [
        "72882de6e16efb89ddfdb166917a91fff95325da"
      ],
      "author": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Wed Sep 05 10:36:32 2018 -0700"
      },
      "committer": {
        "name": "Wonsik Kim",
        "email": "wonsik@google.com",
        "time": "Wed Sep 05 10:36:32 2018 -0700"
      },
      "message": "stagefright: add TEST_MAPPING\n\nTest: atest --test-mapping frameworks/av/media/libstagefright:postsubmit\nChange-Id: Ie4e19b5d794e50774696c66d8105973f5c7beb3a\n"
    },
    {
      "commit": "72882de6e16efb89ddfdb166917a91fff95325da",
      "tree": "709713a7f1223d2686af02394f5d30527850d6b1",
      "parents": [
        "f7996c2c055e617b71c654c2574b939400e9c42c",
        "ad02cc6c4091a44fb60c475731c8f4cac9a55ab0"
      ],
      "author": {
        "name": "Edwin Wong",
        "email": "edwinwong@google.com",
        "time": "Wed Sep 05 16:58:45 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Sep 05 16:58:45 2018 +0000"
      },
      "message": "Merge \"Add onExpirationUpdate and onKeyStatusChange listeners.\""
    },
    {
      "commit": "f7996c2c055e617b71c654c2574b939400e9c42c",
      "tree": "294c64457a404e9401ae61e258cc3e425e9b30c2",
      "parents": [
        "89e319f74c394a59f180e88cc57e0afd9993a0a4",
        "cf3d82c34b8a737408113dddad341b8c98251a8e"
      ],
      "author": {
        "name": "Eric Tan",
        "email": "taneric@google.com",
        "time": "Wed Sep 05 16:43:12 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Sep 05 16:43:12 2018 +0000"
      },
      "message": "Merge \"NBLog: refactor Writer API for extensibility\""
    },
    {
      "commit": "15f97c996f29c780f52fe3504fabd08dbde066ba",
      "tree": "8998772c04ba3863be56cc2c1c98c56f688dbf48",
      "parents": [
        "0d97cec0533f47237b16b294fd92a827f2ebdc6f"
      ],
      "author": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Tue Sep 04 14:06:27 2018 -0700"
      },
      "committer": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Wed Sep 05 09:25:11 2018 -0700"
      },
      "message": "aaudio: set to SHARED when EXCLUSIVE fails\n\nSHARED streams and endpoints were being created with sharing mode\nset to EXCLUSIVE. This was confusing the close() code and caused a hang.\n\nNow we create a modified Request object with the sharing mode set\ncorrectly.\n\nBug: 112709847\nTest: Hack AAudioServiceEndpointMMAP so isBufferShareable is false.\nTest: \u0027adb shell write_sine_callback -pl -x -s2\u0027 should not hang.\nChange-Id: I7a5c8260beaffdd706f34d35ef00a61b072adb1d\n"
    },
    {
      "commit": "89e319f74c394a59f180e88cc57e0afd9993a0a4",
      "tree": "c36b849b03103cfbbbda9017ed0973cae4d9f71b",
      "parents": [
        "dc1cbab5c2a5877cefa95fc5ab8c43c201dfb097",
        "9ec33560e39c4234cf1d693fc246be90643f001c"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed Sep 05 05:06:23 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Sep 05 05:06:23 2018 +0000"
      },
      "message": "Merge \"android.hardware.media.bufferpool@2.0 tests\""
    },
    {
      "commit": "dc1cbab5c2a5877cefa95fc5ab8c43c201dfb097",
      "tree": "6b5c6ade98168deaf0966f892e2b4eb6a309a7e9",
      "parents": [
        "b56ecdf29635dd53b986e11eb8f4ca166587ef04",
        "7d313b3fd19dabc52ecce313b18c79d8cd253383"
      ],
      "author": {
        "name": "Hung-ying Tyan",
        "email": "tyanh@google.com",
        "time": "Tue Sep 04 21:47:34 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Sep 04 21:47:34 2018 -0700"
      },
      "message": "Merge \"Remove /vendor/lib[64]/extractors from MediaExtractorFactory\" am: 7b95c4c042 am: 649ac89590\nam: 7d313b3fd1\n\nChange-Id: I0a1903f18219da2138ddbdb5d8e5e6170f388495\n"
    },
    {
      "commit": "7d313b3fd19dabc52ecce313b18c79d8cd253383",
      "tree": "9cd2539ed4ead003bd9ddc21eefcbe9c4f1f0941",
      "parents": [
        "56b347f218dd79915c86756d4bdfed027bb247b2",
        "649ac89590a610b13caf4e94f1c2a417b7c90a80"
      ],
      "author": {
        "name": "Hung-ying Tyan",
        "email": "tyanh@google.com",
        "time": "Tue Sep 04 21:43:22 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Sep 04 21:43:22 2018 -0700"
      },
      "message": "Merge \"Remove /vendor/lib[64]/extractors from MediaExtractorFactory\" am: 7b95c4c042\nam: 649ac89590\n\nChange-Id: I9fe793962e6e340d5b2a99c53b28978ff05a482e\n"
    },
    {
      "commit": "649ac89590a610b13caf4e94f1c2a417b7c90a80",
      "tree": "9c6c005cf291ea963572fc53fde08dbf82b1fe8b",
      "parents": [
        "701b656a0b285af28f173093e14522e2f491e698",
        "7b95c4c042eabd256109399a2065bdb36047e461"
      ],
      "author": {
        "name": "Hung-ying Tyan",
        "email": "tyanh@google.com",
        "time": "Tue Sep 04 21:38:47 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Sep 04 21:38:47 2018 -0700"
      },
      "message": "Merge \"Remove /vendor/lib[64]/extractors from MediaExtractorFactory\"\nam: 7b95c4c042\n\nChange-Id: I216a22c9edbae150507f49ec5f5a66d536992487\n"
    },
    {
      "commit": "7b95c4c042eabd256109399a2065bdb36047e461",
      "tree": "092caa9458fce38d3044b0f2bc87a984a8d88efb",
      "parents": [
        "17e83a3fdf34b8c0bbe38404aa3b02310113813c",
        "cc0e21a043d13e92c11b71a04c5c6831c613591f"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed Sep 05 04:22:30 2018 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Sep 05 04:22:30 2018 +0000"
      },
      "message": "Merge \"Remove /vendor/lib[64]/extractors from MediaExtractorFactory\""
    },
    {
      "commit": "9ec33560e39c4234cf1d693fc246be90643f001c",
      "tree": "d4e7ae9ddcb0e52c6329474ed6992cbcd78a1286",
      "parents": [
        "b56ecdf29635dd53b986e11eb8f4ca166587ef04"
      ],
      "author": {
        "name": "Sungtak Lee",
        "email": "taklee@google.com",
        "time": "Tue Sep 04 15:22:46 2018 -0700"
      },
      "committer": {
        "name": "Sungtak Lee",
        "email": "taklee@google.com",
        "time": "Tue Sep 04 21:10:26 2018 -0700"
      },
      "message": "android.hardware.media.bufferpool@2.0 tests\n\nBug: 112203066\nChange-Id: I9ea8d3dcb7e3c27da0360942d61882cd3459d10a\n"
    },
    {
      "commit": "cf3d82c34b8a737408113dddad341b8c98251a8e",
      "tree": "358cb91f4b3b812054daab215b754b9920cf4a50",
      "parents": [
        "e98dd6f5496aaba009ed27be8e83af1cd10869c5"
      ],
      "author": {
        "name": "Eric Tan",
        "email": "taneric@google.com",
        "time": "Tue Sep 04 15:44:45 2018 -0700"
      },
      "committer": {
        "name": "Eric Tan",
        "email": "taneric@google.com",
        "time": "Tue Sep 04 18:02:00 2018 -0700"
      },
      "message": "NBLog: refactor Writer API for extensibility\n\nNo new functionality was added, and no existing functionality was\nremoved.\n\nEvent types have been renamed and reorganized according to\nfunctionality. A compile-time mapping from Event to C++ data type allows\nfor a generic Event log() template function to avoid the need to add a\nnew logging function when a new Event is added to enum NBLog::Event.\n\nMost LockedWriter functions were deleted because they did not involve\naccessing shared variables. Only the functions that accessed shared\nvariables were kept in LockedWriter.\n\nTest: dumpsys media.log -r\nBug: 68148948\nChange-Id: I8a27f1690795cdb0b84e92033b7cbf4588ba175e\n"
    },
    {
      "commit": "b56ecdf29635dd53b986e11eb8f4ca166587ef04",
      "tree": "91d8a64771d88c63192bbb3e6a5ea2cf3de1c1f3",
      "parents": [
        "20993fa7abe98f7821cf4039b43a1503751610a7",
        "56b347f218dd79915c86756d4bdfed027bb247b2"
      ],
      "author": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Tue Sep 04 14:03:48 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Sep 04 14:03:48 2018 -0700"
      },
      "message": "[automerger skipped] Merge changes from topic \"b113052379-cp-from-pi-dev-p1\" am: 17e83a3fdf  -s ours am: 701b656a0b  -s ours\nam: 56b347f218  -s ours\n\nChange-Id: I3a9fd45736f6c3da245d1994560c6f6d84e04b38\n"
    },
    {
      "commit": "56b347f218dd79915c86756d4bdfed027bb247b2",
      "tree": "1e76412fe49cf47769b3481e2acd810500bbecc6",
      "parents": [
        "e74e76d59723a4c5439ad3a902655d7e2ae5c76a",
        "701b656a0b285af28f173093e14522e2f491e698"
      ],
      "author": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Tue Sep 04 13:43:28 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Sep 04 13:43:28 2018 -0700"
      },
      "message": "[automerger skipped] Merge changes from topic \"b113052379-cp-from-pi-dev-p1\" am: 17e83a3fdf  -s ours\nam: 701b656a0b  -s ours\n\nChange-Id: Id32888550d408f80bc442a4f543129116fe001dd\n"
    },
    {
      "commit": "701b656a0b285af28f173093e14522e2f491e698",
      "tree": "95e0e5d80f342ea610da9e6a4a5d12d56aceee3d",
      "parents": [
        "5c86ca4a501a02a9c0908d5f99ff836fe5fd514f",
        "17e83a3fdf34b8c0bbe38404aa3b02310113813c"
      ],
      "author": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Tue Sep 04 13:30:13 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Sep 04 13:30:13 2018 -0700"
      },
      "message": "[automerger skipped] Merge changes from topic \"b113052379-cp-from-pi-dev-p1\"\nam: 17e83a3fdf  -s ours\n\nChange-Id: I842ab1cb4c297241acd41c2e3a86a930b52e52a2\n"
    },
    {
      "commit": "17e83a3fdf34b8c0bbe38404aa3b02310113813c",
      "tree": "cc423a48e080370646247207426e8568bd854bf4",
      "parents": [
        "89bdf3ae713cf5c4d5f12b037fc8ae127af09c0c",
        "0bf1ac17f871eb11eadf94f98df87d5f5d7aced1"
      ],
      "author": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Tue Sep 04 20:20:17 2018 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue Sep 04 20:20:17 2018 +0000"
      },
      "message": "Merge changes from topic \"b113052379-cp-from-pi-dev-p1\"\n\n* changes:\n  Camera: update hardware level related docs\n  Fix copy/paste error\n  Annotate remaining AMEDIAFORMAT variables\n  Add __INTRODUCED_IN to more NdkMediaFormat.h variables\n  Add __INTRODUCED_IN to NdkMediaFormat.h variables too.\n  Add __INTRODUCED_IN to audio/camera/media headers.\n  Camera: NDK codegen doc update\n"
    },
    {
      "commit": "20993fa7abe98f7821cf4039b43a1503751610a7",
      "tree": "91d8a64771d88c63192bbb3e6a5ea2cf3de1c1f3",
      "parents": [
        "9a03f226b3c3c4f4a69cd9ac4ed58c2b720fc802",
        "e74e76d59723a4c5439ad3a902655d7e2ae5c76a"
      ],
      "author": {
        "name": "Chih-hung Hsieh",
        "email": "chh@google.com",
        "time": "Tue Sep 04 09:47:22 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Sep 04 09:47:22 2018 -0700"
      },
      "message": "Merge \"Fix potential memory leak.\" am: 89bdf3ae71 am: 5c86ca4a50\nam: e74e76d597\n\nChange-Id: Idad7c5e994ac2a4ce686e79cb3ca9db65c60f2cc\n"
    },
    {
      "commit": "e74e76d59723a4c5439ad3a902655d7e2ae5c76a",
      "tree": "1e76412fe49cf47769b3481e2acd810500bbecc6",
      "parents": [
        "bfff52ee8ea2a87a3358ea44d61237734b5ef098",
        "5c86ca4a501a02a9c0908d5f99ff836fe5fd514f"
      ],
      "author": {
        "name": "Chih-hung Hsieh",
        "email": "chh@google.com",
        "time": "Tue Sep 04 09:43:11 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Sep 04 09:43:11 2018 -0700"
      },
      "message": "Merge \"Fix potential memory leak.\" am: 89bdf3ae71\nam: 5c86ca4a50\n\nChange-Id: Ia40481c763a1257737b354fa772ba77d53691235\n"
    },
    {
      "commit": "5c86ca4a501a02a9c0908d5f99ff836fe5fd514f",
      "tree": "95e0e5d80f342ea610da9e6a4a5d12d56aceee3d",
      "parents": [
        "9cee5d1541e6efed76e66de9cff2eff294e774e6",
        "89bdf3ae713cf5c4d5f12b037fc8ae127af09c0c"
      ],
      "author": {
        "name": "Chih-hung Hsieh",
        "email": "chh@google.com",
        "time": "Tue Sep 04 09:39:00 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Sep 04 09:39:00 2018 -0700"
      },
      "message": "Merge \"Fix potential memory leak.\"\nam: 89bdf3ae71\n\nChange-Id: If83e8a7631f7cbb37b0f1724b94957a9dab347ca\n"
    },
    {
      "commit": "89bdf3ae713cf5c4d5f12b037fc8ae127af09c0c",
      "tree": "17d14bdd4b24c30bde8c579ea47ead00d7042a94",
      "parents": [
        "1a1ef1ddc2b4e0968ce212844e16db4637fdc4e3",
        "0307768305a87dd94f1b02d36ad2f53e3041bdaf"
      ],
      "author": {
        "name": "Chih-hung Hsieh",
        "email": "chh@google.com",
        "time": "Tue Sep 04 16:29:08 2018 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue Sep 04 16:29:08 2018 +0000"
      },
      "message": "Merge \"Fix potential memory leak.\""
    },
    {
      "commit": "9a03f226b3c3c4f4a69cd9ac4ed58c2b720fc802",
      "tree": "cd4251ef930043b5a49dc295edfed55ab1cef84b",
      "parents": [
        "12622e385ec3e78751e67311f99f364c7b283737",
        "2f074ce7ca8cce3189cebe0a0ce1b1ff402c814b"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Tue Sep 04 15:47:07 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Sep 04 15:47:07 2018 +0000"
      },
      "message": "Merge \"Camera3: Handle stream format override for shared output stream\""
    },
    {
      "commit": "cc0e21a043d13e92c11b71a04c5c6831c613591f",
      "tree": "4e346f4eaa3f2312848bc14d86236d2b7aa38619",
      "parents": [
        "1a1ef1ddc2b4e0968ce212844e16db4637fdc4e3"
      ],
      "author": {
        "name": "Hung-ying Tyan",
        "email": "tyanh@google.com",
        "time": "Tue Sep 04 17:09:10 2018 +0800"
      },
      "committer": {
        "name": "Hung-ying Tyan",
        "email": "tyanh@google.com",
        "time": "Tue Sep 04 17:22:54 2018 +0800"
      },
      "message": "Remove /vendor/lib[64]/extractors from MediaExtractorFactory\n\nIt\u0027s a Treble violation for a system process to access vendor files directly.\nIt\u0027s also guarded by sepolicy so the vendor path is not functional anyway.\n\nBug: 67908547\nBug: 111190371\nTest: build aosp_sailfish-userdebug\nChange-Id: I9d372277a0d22ce0f11b6a7597c12d2b46d895ea\n"
    },
    {
      "commit": "12622e385ec3e78751e67311f99f364c7b283737",
      "tree": "fadc4af0faeaca8748c4a6eb111367e21f062a2d",
      "parents": [
        "b5817c55a11274cc8e00ad15dabc46836e0c3ea5",
        "f7fa2009b579aabf8275c8c96d3e2918b18b12bf"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Mon Sep 03 17:23:18 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Sep 03 17:23:18 2018 +0000"
      },
      "message": "Merge \"Camera: Do not treat non-increasing timestamp as fatal\""
    },
    {
      "commit": "b5817c55a11274cc8e00ad15dabc46836e0c3ea5",
      "tree": "29e6c2467a0c5f3e270f55fad9f94b1d2a242a5d",
      "parents": [
        "4e7cae5eed67640e500215af3faed8e45f8c84d1",
        "bfff52ee8ea2a87a3358ea44d61237734b5ef098"
      ],
      "author": {
        "name": "Hirokazu Honda",
        "email": "hiroh@google.com",
        "time": "Sun Sep 02 22:00:57 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sun Sep 02 22:00:57 2018 -0700"
      },
      "message": "Merge \"mediacodec-x86.policy: Allow media.omx to call sched_setscheduler/uname on x86 platform\" am: 1a1ef1ddc2 am: 9cee5d1541\nam: bfff52ee8e\n\nChange-Id: Ib50e1b51e5a3cb78ef96bcf209f596f9071d2893\n"
    },
    {
      "commit": "bfff52ee8ea2a87a3358ea44d61237734b5ef098",
      "tree": "6f95536b1bcef895658f788875419a4a8e70b15e",
      "parents": [
        "acb537faa7157d4574e55c5f72d620496b3770f2",
        "9cee5d1541e6efed76e66de9cff2eff294e774e6"
      ],
      "author": {
        "name": "Hirokazu Honda",
        "email": "hiroh@google.com",
        "time": "Sun Sep 02 21:56:47 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sun Sep 02 21:56:47 2018 -0700"
      },
      "message": "Merge \"mediacodec-x86.policy: Allow media.omx to call sched_setscheduler/uname on x86 platform\" am: 1a1ef1ddc2\nam: 9cee5d1541\n\nChange-Id: Iefade391ba643a990f750595ed484ad6e9859279\n"
    },
    {
      "commit": "9cee5d1541e6efed76e66de9cff2eff294e774e6",
      "tree": "fa2a4461d8d47a68ebdc04d3f4425e1a1d9a9f87",
      "parents": [
        "5b8c6e356727fa1edbdf6363291e0aa838b1932e",
        "1a1ef1ddc2b4e0968ce212844e16db4637fdc4e3"
      ],
      "author": {
        "name": "Hirokazu Honda",
        "email": "hiroh@google.com",
        "time": "Sun Sep 02 21:52:38 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sun Sep 02 21:52:38 2018 -0700"
      },
      "message": "Merge \"mediacodec-x86.policy: Allow media.omx to call sched_setscheduler/uname on x86 platform\"\nam: 1a1ef1ddc2\n\nChange-Id: Id0da68cec760ff4e53481e3e3eb049a1fe92276e\n"
    },
    {
      "commit": "1a1ef1ddc2b4e0968ce212844e16db4637fdc4e3",
      "tree": "1fef80e96c95270befd5a16702eda5c54d0e1639",
      "parents": [
        "f53db30222c835ce495c5b115ad1e01227a519fe",
        "ba6a4c224dcd594b70dfa1569f5b31906346ce9c"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Mon Sep 03 04:44:34 2018 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Mon Sep 03 04:44:34 2018 +0000"
      },
      "message": "Merge \"mediacodec-x86.policy: Allow media.omx to call sched_setscheduler/uname on x86 platform\""
    },
    {
      "commit": "4e7cae5eed67640e500215af3faed8e45f8c84d1",
      "tree": "021b5b0257bb0aa2b1c5a36642a40d1b419c7cfb",
      "parents": [
        "8eed46df6794c7cd0a8501ad33592a681738e355",
        "acb537faa7157d4574e55c5f72d620496b3770f2"
      ],
      "author": {
        "name": "Eino-Ville Talvala",
        "email": "etalvala@google.com",
        "time": "Fri Aug 31 17:59:57 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Aug 31 17:59:57 2018 -0700"
      },
      "message": "[automerger skipped] Merge \"Camera: DistortionMapper: Fix to work consistently\" am: f53db30222  -s ours am: 5b8c6e3567  -s ours\nam: acb537faa7  -s ours\n\nChange-Id: I563a6b165a8e6d42789653285bee53f6ed9c8106\n"
    },
    {
      "commit": "acb537faa7157d4574e55c5f72d620496b3770f2",
      "tree": "173d4ea6472758d581726b4dedfface91375c16b",
      "parents": [
        "c9bf5e9feca9a663f6f05c6875f8b30cfda03140",
        "5b8c6e356727fa1edbdf6363291e0aa838b1932e"
      ],
      "author": {
        "name": "Eino-Ville Talvala",
        "email": "etalvala@google.com",
        "time": "Fri Aug 31 17:38:15 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Aug 31 17:38:15 2018 -0700"
      },
      "message": "[automerger skipped] Merge \"Camera: DistortionMapper: Fix to work consistently\" am: f53db30222  -s ours\nam: 5b8c6e3567  -s ours\n\nChange-Id: Ic2f5085e36018dfba3caa4aa1e067ed5b9617af9\n"
    },
    {
      "commit": "5b8c6e356727fa1edbdf6363291e0aa838b1932e",
      "tree": "cc4e706f0864c853b6faca04ac54b2893e41b640",
      "parents": [
        "d6b8ceff6694dee7cb454e2e4775d6444c32f827",
        "f53db30222c835ce495c5b115ad1e01227a519fe"
      ],
      "author": {
        "name": "Eino-Ville Talvala",
        "email": "etalvala@google.com",
        "time": "Fri Aug 31 17:05:51 2018 -0700"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Aug 31 17:05:51 2018 -0700"
      },
      "message": "[automerger skipped] Merge \"Camera: DistortionMapper: Fix to work consistently\"\nam: f53db30222  -s ours\n\nChange-Id: I55074afee4ffb2aab35396339f5e126de2671dd7\n"
    },
    {
      "commit": "f53db30222c835ce495c5b115ad1e01227a519fe",
      "tree": "a8340bfd85339debf0abf77c46ab96ebd2ba808c",
      "parents": [
        "1635b6c22bd8b49615ff8570c28f88f9591a9c06",
        "b6ffcfec7001b3d6049803a04df275d7437d76c6"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Fri Aug 31 23:38:53 2018 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Fri Aug 31 23:38:53 2018 +0000"
      },
      "message": "Merge \"Camera: DistortionMapper: Fix to work consistently\""
    },
    {
      "commit": "f7fa2009b579aabf8275c8c96d3e2918b18b12bf",
      "tree": "0589ed000ff3ee7d257218bfcf660492d5dc8f03",
      "parents": [
        "8eed46df6794c7cd0a8501ad33592a681738e355"
      ],
      "author": {
        "name": "Shuzhen Wang",
        "email": "shuzhenwang@google.com",
        "time": "Fri Aug 31 14:24:18 2018 -0700"
      },
      "committer": {
        "name": "Shuzhen Wang",
        "email": "shuzhenwang@google.com",
        "time": "Fri Aug 31 21:46:28 2018 +0000"
      },
      "message": "Camera: Do not treat non-increasing timestamp as fatal\n\nCertain devices generate duplicate timestamps for cases like video\nrecording. So do not treat non-increasing timestamps as fatal for now.\n\nTest: Failed camera CTS on Pixel device\nBug: 113670946\nChange-Id: I3708f46111edf031f48f460e4efce9f9c46f174e\n"
    },
    {
      "commit": "8eed46df6794c7cd0a8501ad33592a681738e355",
      "tree": "021b5b0257bb0aa2b1c5a36642a40d1b419c7cfb",
      "parents": [
        "2aab8817c630a446fefaefb706c6e2d1e42b1ecc",
        "3a34df9c6e81d4638dcd763f990de89b1de3a8b5"
      ],
      "author": {
        "name": "Andy Hung",
        "email": "hunga@google.com",
        "time": "Fri Aug 31 17:18:12 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Aug 31 17:18:12 2018 +0000"
      },
      "message": "Merge \"AudioMixer: Change setBufferProvider order of reset\""
    },
    {
      "commit": "2aab8817c630a446fefaefb706c6e2d1e42b1ecc",
      "tree": "e55b624b6a7d694d53f40141bf5db0a176242d39",
      "parents": [
        "608f8c4479f9f5ee2a75629de9a3324e1a529267",
        "0fc8f214ed433cf5e9d90e71988309809f8c536c"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Fri Aug 31 00:58:47 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Aug 31 00:58:47 2018 +0000"
      },
      "message": "Merge \"Remove drm log spam\""
    },
    {
      "commit": "0fc8f214ed433cf5e9d90e71988309809f8c536c",
      "tree": "a77b7e7a9ff7786c8ecf54eeb5fa55d8be6afc3b",
      "parents": [
        "f344afa981e537b5f354352284272a8a51cf6759"
      ],
      "author": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Thu Aug 30 15:46:58 2018 -0700"
      },
      "committer": {
        "name": "Jeff Tinker",
        "email": "jtinker@google.com",
        "time": "Fri Aug 31 00:52:35 2018 +0000"
      },
      "message": "Remove drm log spam\n\ntest:compiles\nbug:77813983\nChange-Id: Iae9c8d3a958cad74dd10395a5184a3b82d263200\n"
    },
    {
      "commit": "608f8c4479f9f5ee2a75629de9a3324e1a529267",
      "tree": "0eb06cbd2db94a124d3bc7a1ebb500f1a653221c",
      "parents": [
        "a132c7f6d4c63168564a6248ea8dace29f8a1893",
        "5ec3d6ac0c607e89d03ba5a9499e471d8559dc7e"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Fri Aug 31 00:37:30 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Aug 31 00:37:30 2018 +0000"
      },
      "message": "Merge \"Move unused classes out of stagefright foundataion\""
    },
    {
      "commit": "a132c7f6d4c63168564a6248ea8dace29f8a1893",
      "tree": "bfbdc2dde9fa33759811c23854a9945052c0f0a0",
      "parents": [
        "4f9ad3e8df07d613c120a41bed250ef61786637d",
        "5c4f82623287b09db3a8131dbe4508893648be90"
      ],
      "author": {
        "name": "Phil Burk",
        "email": "philburk@google.com",
        "time": "Fri Aug 31 00:22:48 2018 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Aug 31 00:22:48 2018 +0000"
      },
      "message": "Merge \"aaudio: clip setBufferSizeInFrames()\""
    },
    {
      "commit": "97258dc211b68978b4f74e114c113a6482e7e89b",
      "tree": "e1f51dbefdd3899009df38fb05dee04cde6db9be",
      "parents": [
        "09e61928447df19d0459cce2a2b0196e075700cc"
      ],
      "author": {
        "name": "Shuzhen Wang",
        "email": "shuzhenwang@google.com",
        "time": "Wed Aug 15 13:59:56 2018 -0700"
      },
      "committer": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Thu Aug 30 16:42:14 2018 -0700"
      },
      "message": "Camera: Documentation update to remove physicalIds\n\nPublic API doesn\u0027t see android.logicalcam.physicalIds. Remove it\nfrom public doc.\n\nBug: 112655222\nBug: 113052379\nTest: Manual reading of modified text\nChange-Id: I111a57d6dbdbd2f10df5e440c34ee8526918e134\nMerged-In: I111a57d6dbdbd2f10df5e440c34ee8526918e134\n(cherry picked from commit 11e0589b4dea913f66668ea483dd52eed3d3869b)\n"
    },
    {
      "commit": "0bf1ac17f871eb11eadf94f98df87d5f5d7aced1",
      "tree": "5fbfc0bc8c403793b742e03cbcb527b00a4b0a1c",
      "parents": [
        "3d165e20ba45df328dc5f9dc0998ce9aab782fb7"
      ],
      "author": {
        "name": "Yin-Chia Yeh",
        "email": "yinchiayeh@google.com",
        "time": "Fri Jul 13 11:50:32 2018 -0700"
      },
      "committer": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Thu Aug 30 16:42:14 2018 -0700"
      },
      "message": "Camera: update hardware level related docs\n\nCodegen doc update\n\nTest: none\nBug: 77861412\nBug: 113052379\nChange-Id: Iee396cae3a2b830556174169f3a2398ed0e0e20c\nMerged-In: Iee396cae3a2b830556174169f3a2398ed0e0e20c\n(cherry picked from commit 66a38580fd9e7dcdd696e9bdcc9dadeb4584ff47)\n"
    },
    {
      "commit": "09e61928447df19d0459cce2a2b0196e075700cc",
      "tree": "d6f9842bb8bf06a6ece2d76ef77c3c50a0c0841a",
      "parents": [
        "807e519942640fb1a5118d22cdf8685b3bf81af3"
      ],
      "author": {
        "name": "Eino-Ville Talvala",
        "email": "etalvala@google.com",
        "time": "Wed Aug 01 17:23:36 2018 -0700"
      },
      "committer": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Thu Aug 30 16:42:14 2018 -0700"
      },
      "message": "Camera: Documentation updates for calibration and distortion correction\n\n- Add more notes on coordinate axes\n- Add more text on metadata when distortion correction is active\n- Note that poseTranslation needs to be negated in many use cases\n- Fix coordinate system references for OIS reporting, add more information\n- Note that pixel centers at half-integers for the camera API metadata\n  such as lens intrinsics\n\nBug: 79371566\nBug: 74434422\nBug: 109742048\nBug: 109834325\nBug: 109817371\nBug: 112107924\nBug: 113052379\nTest: Manual reading of added text\nChange-Id: I8609e951c5045d0e918b2c791fcbe50dc8d0873f\nMerged-In: I8609e951c5045d0e918b2c791fcbe50dc8d0873f\n(cherry picked from commit 306a06900b25b5ccd393fb08a6637d74f84e166f)\n"
    },
    {
      "commit": "807e519942640fb1a5118d22cdf8685b3bf81af3",
      "tree": "cc88d4729761cfb4d6fe329695654cfd4a4a2f99",
      "parents": [
        "a524975b35a490f4361e9f4cbf9bb4832e1790e1"
      ],
      "author": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Thu Jul 19 18:30:29 2018 -0700"
      },
      "committer": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Thu Aug 30 16:42:14 2018 -0700"
      },
      "message": "Fix NdkImage.h includes\n\nIt needs stdint.h.\n\nIt\u0027s OK to include android/hardware_buffer.h on pre-26. We\u0027d like to remove\nthe __ANDROID_API__ guard around AImage_getHardwareBuffer, and if/when we\ndo, we\u0027ll need android/hardware_buffer.h. The last time we removed the\n__ANDROID_API__ guards around the APIs, we forgot to remove the one around\nthis #include.\n\nBug: http://b/111130072#comment12\nBug: http://b/113052379\nTest: builds\nChange-Id: Ice8073476d4ad4802e3540f15eee3af29e0b891f\nMerged-In: Ice8073476d4ad4802e3540f15eee3af29e0b891f\n(cherry picked from commit c2039dc505ec5dcc2b5d2f80a3957be1684913a8)\n"
    },
    {
      "commit": "a524975b35a490f4361e9f4cbf9bb4832e1790e1",
      "tree": "d7cd106329f1784221d69168a49b8d50116b7d7e",
      "parents": [
        "6396b959e53afe9727d03e494a1cf056b8c6575d"
      ],
      "author": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Thu Jul 19 18:03:48 2018 -0700"
      },
      "committer": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Thu Aug 30 16:42:14 2018 -0700"
      },
      "message": "Restore __ANDROID_API__ guards for camera/media headers\n\nPartial revert of \"Add __INTRODUCED_IN to audio/camera/media headers.\",\ncommit 85a41536a4885b12120ddafb4d0b3fee8a8613b6.\n\nRestore the API guards where they used to exist. I *could* add\n__ANDROID_API__ around only the function declarations, which is what the\nversioner would do, but the function declarations are mixed up with the\ntypes and constants, so I\u0027d need to add a bunch of __ANDROID_API__ checks\nor reorganize the headers.\n\nNdkMediaFormat.h and AAudio.h still have __INTRODUCED_IN symbols that\naren\u0027t guarded by __ANDROID_API__. Maybe those files should be reorganized\nso they don\u0027t alternate between APIs so much.\n\nTest: builds\nBug: http://b/111668906\nBug: http://b/113052379\nChange-Id: I757a6097f7840ea50e2fc92db7defef493097672\nMerged-In: I757a6097f7840ea50e2fc92db7defef493097672\n(cherry picked from commit 0c9470cec23a62876c398bc6ab9ac7e1588e2bba)\n"
    },
    {
      "commit": "6396b959e53afe9727d03e494a1cf056b8c6575d",
      "tree": "3c5f497002bc9437a3448c76ace6125a365c33e2",
      "parents": [
        "0bf1ac17f871eb11eadf94f98df87d5f5d7aced1"
      ],
      "author": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Thu Jul 19 21:31:57 2018 -0700"
      },
      "committer": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Thu Aug 30 16:42:14 2018 -0700"
      },
      "message": "Remove __INTRODUCED_IN from a typedef\n\n__INTRODUCED_IN only applies to function or variable declarations, not\na typedef to a function pointer.\n\nBug: https://github.com/android-ndk/ndk/issues/706\nBug: http://b/113052379\nTest: builds\nChange-Id: I472565d3e34e5c6a3cd88500ad03ef9ce4489c25\nMerged-In: I472565d3e34e5c6a3cd88500ad03ef9ce4489c25\n(cherry picked from commit e0ec2e3fb2da0d7617f58e0cdbbbb83a75a8d1f0)\n"
    },
    {
      "commit": "3d165e20ba45df328dc5f9dc0998ce9aab782fb7",
      "tree": "6523419f041cf1549763a3d490189c5602d3b594",
      "parents": [
        "866af97dc7b03bf11ea5650002b910fa1fa0be2a"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Mon Jul 09 15:21:14 2018 -0700"
      },
      "committer": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Thu Aug 30 16:42:13 2018 -0700"
      },
      "message": "Fix copy/paste error\n\nTest: build\nBug: 113052379\nChange-Id: I176209b42312e19eb831946dc2f7592266e363e4\nMerged-In: I176209b42312e19eb831946dc2f7592266e363e4\n(cherry picked from commit 40863cba7685f3f42041f0a66986cef4c1949d48)\n"
    },
    {
      "commit": "866af97dc7b03bf11ea5650002b910fa1fa0be2a",
      "tree": "b368a4742eb7ee3371ffb4b5eca85f136c21f1a4",
      "parents": [
        "ce72854cfac33f49603ddd0ef1916eddbe6b9165"
      ],
      "author": {
        "name": "Marco Nelissen",
        "email": "marcone@google.com",
        "time": "Fri Jun 29 13:00:06 2018 -0700"
      },
      "committer": {
        "name": "Ryan Prichard",
        "email": "rprichard@google.com",
        "time": "Thu Aug 30 16:42:13 2018 -0700"
      },
      "message": "Annotate remaining AMEDIAFORMAT variables\n\nTest: build\nBug: 113052379\nChange-Id: I9a37defebd6824ec994887f88958a949228d1da1\nMerged-In: I9a37defebd6824ec994887f88958a949228d1da1\n(cherry picked from commit 185a4a5ff90cc0a3e13e82877341a5493af8f86f)\n"
    }
  ],
  "next": "ce72854cfac33f49603ddd0ef1916eddbe6b9165"
}
