)]}'
{
  "log": [
    {
      "commit": "85808c8293b12571af7d62c15f5cfffeb42c9c98",
      "tree": "18fc503e764725ee6c843179f78591ea5961cc07",
      "parents": [
        "d4932d9b5d913f80fc3ef569c9aa9de87b46fd85",
        "1b3877a96567c4021223c7b7c62c11db60db47fd"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Mon Aug 07 05:49:25 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Aug 07 05:49:25 2017 +0000"
      },
      "message": "Merge \"NetworkCapabilities: fix describeImmutableDifferences\" into oc-dr1-dev\nam: 1b3877a965\n\nChange-Id: I50748aa0c9332787797f91265afccf82ceabf332\n"
    },
    {
      "commit": "8a3a012a1cd497a33bd6ec1d5935b79a695e5731",
      "tree": "9450551330d5a95d357fb2746f6d0fde26772d5c",
      "parents": [
        "82e815616e1fcab7bcdab737dfc1a28946b0f486"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Fri Aug 04 13:18:40 2017 +0900"
      },
      "committer": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Sat Aug 05 11:37:10 2017 +0900"
      },
      "message": "NetworkCapabilities: fix describeImmutableDifferences\n\nThis patch fixes the mask used in describeImmutableDifferences which did\nnot correctly turn NET_CAPABILITY_NOT_METERED into bit flag.\n\nBug: 63326103\nTest: added unit tests, runtest frameworks-net\nMerged-In: Ib6b390b1daef5912859302692af7dcd6cfd3e39a\nMerged-In: If38efacdeec8476880835657938e435f9b598525\nMerged-In: Ieccad46fcffcaf748f5644b04617e9a82527000e\nMerged-In: I533ef8fe369cec19d283ff2950314fce6e28cffd\nMerged-In: I12636c6699ff60487a28570208e819ea0b66fa2e\nMerged-In: Ie5df14e0ea1c12e0cfabe87978ac6c9b744353b2\n\n(cherry picked from commit 2ecb9408f4102687f20f9ca19c13071ac6098cc6)\n\nChange-Id: I74ecf34a2c079c74152d00caea2c220e9c6d1fa5\n"
    },
    {
      "commit": "58d7a76e8d690b83fda66e91a2052ed56675877d",
      "tree": "e5e4ea1aa5c53b1c8fedd907687fb4bcd6802bc5",
      "parents": [
        "0e353d3c12864e0af6ff46a4a30af0dbc8232ff7",
        "f98facc3b82ea45209831aa7ecdb6155b6744b57"
      ],
      "author": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Sat Jul 29 23:17:49 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sat Jul 29 23:17:49 2017 +0000"
      },
      "message": "Merge \"Scrim opacity must satisfy GAR\" into oc-dr1-dev\nam: f98facc3b8\n\nChange-Id: Iab836083f7e3ea86263de1a1d2a2d69d7e25fe73\n"
    },
    {
      "commit": "9324aa926a7fe74ed769525c3d93d4a55a378267",
      "tree": "ac3eb11569430819fa4939593c15b1e06dbd5b14",
      "parents": [
        "48db7e6dcd78a9b5dda896ab022e4e4285af91b5"
      ],
      "author": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Wed Jul 26 20:29:38 2017 -0700"
      },
      "committer": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Fri Jul 28 10:07:04 2017 -0700"
      },
      "message": "Scrim opacity must satisfy GAR\n\nChange-Id: Ic0a2423d73f0a3439a0dc4de8eb6e4719dbf36e1\nFixes: 63365056\nTest: runtest -x tests/Internal/src/com/android/internal/graphics/ColorUtilsTest.java\n"
    },
    {
      "commit": "b704e7aa75e74d955b44a53f5d0f0436dd5a670f",
      "tree": "357a9075fca980cf3a20216e0d794f1b5542c5f0",
      "parents": [
        "2dfbbb3aa460fd01719eec1b42219e0715f02e2e",
        "a03bf7acd145e264f64aec6dedd0d537cca6bef6"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Fri Jul 28 04:39:14 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jul 28 04:39:14 2017 +0000"
      },
      "message": "Merge \"NetworkNotificationManager: correctly handle existing notifications\" into oc-dr1-dev\nam: a03bf7acd1\n\nChange-Id: I4ca3dcc293be5408a6f207e1ac1a7229a915723a\n"
    },
    {
      "commit": "3cff783a05b325862be6729db36f4d48f68ec39e",
      "tree": "92bc9157c30d35586930597914544c4c74960b50",
      "parents": [
        "3d1e1cc9db6e84c19274c431ffa3d32c1a95bed2"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Tue Jul 25 21:57:51 2017 +0900"
      },
      "committer": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Fri Jul 28 09:17:20 2017 +0900"
      },
      "message": "NetworkNotificationManager: correctly handle existing notifications\n\nThis patch corrects a regression added by commit fb2609d3eee1 that did\nnot take into account the case of multiple notifications shown for a\nsingle network id. Given how network notifications are triggered, it can\nhappen that NO_INTERNET and SIGN_IN notifications are both triggered for\nthe same network when captive portal detection is slow.\n\nContrary to the situation before commit fb2609d3eee1, a notification\npriority order is introduced so that SIGN_IN always overrides\nNO_INTERNET, and NO_INTERNET is ignored if SIGN_IN is already present.\n\nBug: 63676954\nBug: 62503737\nTest: runtest frameworks-net, added new unit tests\nMerged-In: Ib8658601e8d4dc6c41b335ab7dd8caa0cccd9531\nMerged-In: I4432f66067ea1ab02e1d2dfe42530bcdafa52df6\nMerged-In: I74631b0bfd14daf18a1641ed7f2ec323d636ebbf\nMerged-In: I73cc879e910d503946facdba498b300337f349fd\nMerged-In: Ieed9e3e7755e0c5f89dc41ef66f47d4dbf4c66a9\nMerged-In: I0aa590170f1bd4c37175c7e35e54d52f1fb21347\n\n(cherry picked from commit 5fcd050e0ecd5985cf184f55ea3df4434da8f824)\n\nChange-Id: I41675768ab59e9b23ca4275edf297b82595e5730\n"
    },
    {
      "commit": "ef15776aaf850777dfa7f640bcd3889855a01314",
      "tree": "c5f1506a11d6f8c26ed51dae1ed7ba206ff85c28",
      "parents": [
        "3072aa76c9ee475bdc76d16987855a7b7feffff6",
        "a1f64b0a9188d105ef1821510150b2ee42c9e47d"
      ],
      "author": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Tue Jul 25 12:00:01 2017 -0700"
      },
      "committer": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Tue Jul 25 12:00:01 2017 -0700"
      },
      "message": "resolve merge conflicts of a1f64b0a9188 to oc-mr1-dev\n\nTest: I solemnly swear I tested this conflict resolution.\nChange-Id: Ic2395d055e1f27b186c3b87be5440dc410ee16a3\n"
    },
    {
      "commit": "e17ce5286f2c25c2ce440b30f476e9e88a6d1e8e",
      "tree": "ca33ca59ca8f6307c57d06246458e0bc8b887634",
      "parents": [
        "f5c39226458537b7816d36339b4f343eac064b39"
      ],
      "author": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Mon Jul 17 15:45:06 2017 -0700"
      },
      "committer": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Mon Jul 24 13:26:22 2017 -0700"
      },
      "message": "Fix jank when switching themes\n\nTurning overlays on and off takes time,\nit also doesn\u0027t allow us to have fine control\nover which view is using which theme.\nLock screen colors are now driven by themes.\n\nChange-Id: Ie8860d00dbb0705ed76edf60a9d3030618dd21ca\nFixes: 63751714\nTest: Visual. Set wallpapers, unlock.\nTest: runtest -x packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerTest.java\nTest: runtest -x tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java\nTest: systrace\n"
    },
    {
      "commit": "7f58322d51ad63a1282ec8ced0675ca25a4b400e",
      "tree": "86bb9e1b92bcbb3033ebd01a487577cdcea0f6a1",
      "parents": [
        "d487520e4c2cc3ef6ce0ccffef94e49d245e6d6d",
        "6498f962836ff75d55510fbe0d8ddfd3c5f5dc34"
      ],
      "author": {
        "name": "Jorim Jaggi",
        "email": "jjaggi@google.com",
        "time": "Mon Jul 24 14:14:34 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Jul 24 14:14:34 2017 +0000"
      },
      "message": "Revert \"Fix jank when switching themes\"\nam: 6498f96283\n\nChange-Id: Ie5813f1c04a6db9d5ee291df764873900add5064\n"
    },
    {
      "commit": "6498f962836ff75d55510fbe0d8ddfd3c5f5dc34",
      "tree": "14504fdd22a63bdf0c3fc547ce0b7b87f2528d3d",
      "parents": [
        "149ff697ffc5b8ba227f4fe6eec4d7cc9520c0ee"
      ],
      "author": {
        "name": "Jorim Jaggi",
        "email": "jjaggi@google.com",
        "time": "Mon Jul 24 15:51:41 2017 +0200"
      },
      "committer": {
        "name": "Jorim Jaggi",
        "email": "jjaggi@google.com",
        "time": "Mon Jul 24 15:53:42 2017 +0200"
      },
      "message": "Revert \"Fix jank when switching themes\"\n\nThis reverts commit e5d0b9dddbcd8e6be7725a89b82fb990db2dade7.\n\nFixes crashloop with lock pattern\n\nChange-Id: I3721444c91e2be625c59ec3e6ba14f1080badc07\nFixes: 63980375\n"
    },
    {
      "commit": "902ba7bab54bdf238eba516e5d65b78664a298a4",
      "tree": "d1b42adee349aa39e8cae966598a71ad8dcc701e",
      "parents": [
        "1986c25da7e31f23ef59e83113d16823378664ae",
        "a74f575ff9440befb3233dcb7f883d1a06e39d63"
      ],
      "author": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Sat Jul 22 04:52:31 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sat Jul 22 04:52:31 2017 +0000"
      },
      "message": "Merge \"Fix jank when switching themes\" into oc-dr1-dev\nam: a74f575ff9\n\nChange-Id: Ibc8fa59cfa6139b03aa7fb08361eb43331484be5\n"
    },
    {
      "commit": "e5d0b9dddbcd8e6be7725a89b82fb990db2dade7",
      "tree": "b906874815c19b9a184a12566c6f93fb59524a88",
      "parents": [
        "6b4f0bb6fee89b7df85759389583eeabe6f645c5"
      ],
      "author": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Mon Jul 17 15:45:06 2017 -0700"
      },
      "committer": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Thu Jul 20 22:44:36 2017 -0700"
      },
      "message": "Fix jank when switching themes\n\nTurning overlays on and off takes time,\nit also doesn\u0027t allow us to have fine control\nover which view is using which theme.\nLock screen colors are now driven by themes.\n\nChange-Id: I4b5db6234cafebbe8eaa952781c038370a11488b\nFixes: 63751714\nTest: Visual. Set wallpapers, unlock.\nTest: runtest -x tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java\nTest: systrace\n"
    },
    {
      "commit": "5e6f438acadce3d0b3fb64d695e6b0860f0a7082",
      "tree": "0d1af0a7e909958b33f5f7af519385738a36c863",
      "parents": [
        "d57fcca82343d276e9d35e86bd7039f19db819a1"
      ],
      "author": {
        "name": "Dake Gu",
        "email": "dake@google.com",
        "time": "Tue Jul 18 16:12:43 2017 -0700"
      },
      "committer": {
        "name": "Dake Gu",
        "email": "dake@google.com",
        "time": "Thu Jul 20 22:53:48 2017 +0000"
      },
      "message": "Initial commit of leanback uibench test\n\nInclude the main leanback BrowseFragment for testing.\n\nTest: UiBenchLeanbackJankTests\n\nChange-Id: I995bc726e267c74150a82575f4ffcf4a4d44b9c3\n"
    },
    {
      "commit": "2412b4d979f0dbdb6ac8265bf97b3665fde83719",
      "tree": "54274f575a44904bc55666e661c169b37f48d48d",
      "parents": [
        "6c315479a3cd82ef1fd1ac02acfc270ef69b7956",
        "9f430b2782849090d2e5e3737304cd26724366fa"
      ],
      "author": {
        "name": "Steven Moreland",
        "email": "smoreland@google.com",
        "time": "Thu Jul 20 03:11:00 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jul 20 03:11:00 2017 +0000"
      },
      "message": "Merge \"frameworks/base: use proper nativehelper headers\" am: 826eafd958 am: 5c091dc944 am: c840945a78\nam: 9f430b2782\n\nChange-Id: Ibe321dd4a8aae9342c76da0780edf94b90e8cd3a\n"
    },
    {
      "commit": "9f430b2782849090d2e5e3737304cd26724366fa",
      "tree": "80e2e9cbd26b7805380828737e9b0553fbafda23",
      "parents": [
        "fe4ec9e9465eb4859845aeea5f1dfbb70b4c9d00",
        "c840945a7809b1fd55621d107ce799d8af370744"
      ],
      "author": {
        "name": "Steven Moreland",
        "email": "smoreland@google.com",
        "time": "Thu Jul 20 03:05:02 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jul 20 03:05:02 2017 +0000"
      },
      "message": "Merge \"frameworks/base: use proper nativehelper headers\" am: 826eafd958 am: 5c091dc944\nam: c840945a78\n\nChange-Id: I654e14f0d1b495450db81592a2e564e308746350\n"
    },
    {
      "commit": "c840945a7809b1fd55621d107ce799d8af370744",
      "tree": "55a8a8690fbe3de3497e95c7773b0422541ec470",
      "parents": [
        "12286b2608f69c3911c40f4dc2a070097373b73f",
        "5c091dc9449b583e18656a8850a61f557dfcc945"
      ],
      "author": {
        "name": "Steven Moreland",
        "email": "smoreland@google.com",
        "time": "Thu Jul 20 02:58:46 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jul 20 02:58:46 2017 +0000"
      },
      "message": "Merge \"frameworks/base: use proper nativehelper headers\" am: 826eafd958\nam: 5c091dc944\n\nChange-Id: I582cc33d13d04950ca066074c292141605f3ca27\n"
    },
    {
      "commit": "5c091dc9449b583e18656a8850a61f557dfcc945",
      "tree": "db4ca724dd661b112d2bd72da67f2a91edce0850",
      "parents": [
        "5f047a68d96f252772144a729f423c172ce816e4",
        "826eafd95885adbfc142f3f70ec82b4091abed85"
      ],
      "author": {
        "name": "Steven Moreland",
        "email": "smoreland@google.com",
        "time": "Thu Jul 20 02:50:53 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jul 20 02:50:53 2017 +0000"
      },
      "message": "Merge \"frameworks/base: use proper nativehelper headers\"\nam: 826eafd958\n\nChange-Id: I36f10ff4d963284a313f1cc5b368f82549a4adb2\n"
    },
    {
      "commit": "826eafd95885adbfc142f3f70ec82b4091abed85",
      "tree": "c687301d0ce95df97e79e82fba033cfdcc3e6035",
      "parents": [
        "b440b572d78d7cfc8a03030913465daac26bebad",
        "2279b2534272282a5b5152723235da397e49195c"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu Jul 20 02:42:49 2017 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Thu Jul 20 02:42:49 2017 +0000"
      },
      "message": "Merge \"frameworks/base: use proper nativehelper headers\""
    },
    {
      "commit": "6b4b646d9c0fa42973a429dbe78c8919a2772961",
      "tree": "65166180f415d66ab3f20a7e99ef02c94bd5634a",
      "parents": [
        "6e292694612780d8d5ce90917c12a33c517c6993"
      ],
      "author": {
        "name": "Tomasz Wasilczyk",
        "email": "twasilczyk@google.com",
        "time": "Wed Jul 19 10:52:28 2017 -0700"
      },
      "committer": {
        "name": "Tomasz Wasilczyk",
        "email": "twasilczyk@google.com",
        "time": "Wed Jul 19 16:26:46 2017 -0700"
      },
      "message": "Rename (FM) Radio to Broadcast Radio to avoid confusion with (GSM) Radio.\n\nBug: b/63405337\nTest: instrumentation\n\nChange-Id: I33c3e450602e521b77b6167f9866278980f17743\n"
    },
    {
      "commit": "e9685cab9af3d9fae5929f89e5e4d199e242efba",
      "tree": "ac5abece59c5f17a823687fa59a4ecad36f22d8c",
      "parents": [
        "d2eb1035ef30a583a06e41e17112c5019f152e95",
        "18856321057942a353e3c99eeff3ab417e39513d"
      ],
      "author": {
        "name": "Ahmed ElArabawy",
        "email": "arabawy@google.com",
        "time": "Wed Jul 19 22:17:21 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 19 22:17:21 2017 +0000"
      },
      "message": "Merge \"Add Configuration to APF Policy\" into oc-dr1-dev am: 1da6af31ff\nam: 1885632105\n\nChange-Id: I5949798a6531344ed90301f452165838fa8adb6a\n"
    },
    {
      "commit": "18856321057942a353e3c99eeff3ab417e39513d",
      "tree": "bf618ed7e21e60a9c53569d0ed747f2bec9b6c83",
      "parents": [
        "85fa07b8312262eddbe795ca00ebd451dab7b8d3",
        "1da6af31ffb67e43a004ba2dddc4be0a0cb7edce"
      ],
      "author": {
        "name": "Ahmed ElArabawy",
        "email": "arabawy@google.com",
        "time": "Wed Jul 19 22:11:40 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 19 22:11:40 2017 +0000"
      },
      "message": "Merge \"Add Configuration to APF Policy\" into oc-dr1-dev\nam: 1da6af31ff\n\nChange-Id: I16346bb98a0b9259f7c3f51e318c472cfc1bb492\n"
    },
    {
      "commit": "1da6af31ffb67e43a004ba2dddc4be0a0cb7edce",
      "tree": "32bd51e78d13a665137ee5a8e0ae89a2517cb05c",
      "parents": [
        "4dfb200d1b13d52da53b9849e813550af8778b4f",
        "4dd7c58fc8fcc5a2c50de5e8eff05ddc5c3b0b8b"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed Jul 19 22:02:09 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Jul 19 22:02:09 2017 +0000"
      },
      "message": "Merge \"Add Configuration to APF Policy\" into oc-dr1-dev"
    },
    {
      "commit": "2279b2534272282a5b5152723235da397e49195c",
      "tree": "884c0a32e34c87d58e8f36329eb77d6dec7a8ab4",
      "parents": [
        "a1d67fb38ec02150d674bc3b8d8354b53417552b"
      ],
      "author": {
        "name": "Steven Moreland",
        "email": "smoreland@google.com",
        "time": "Wed Jul 19 09:50:45 2017 -0700"
      },
      "committer": {
        "name": "Steven Moreland",
        "email": "smoreland@google.com",
        "time": "Wed Jul 19 10:06:40 2017 -0700"
      },
      "message": "frameworks/base: use proper nativehelper headers\n\nlibnativehelper exports headers under nativehelper. These were\navailable before incorrectly as global headers in order to give\naccess to jni.h.\n\nTest: modules using frameworks/base find headers\nBug: 63762847\nChange-Id: I0f9f231acdebe460f279135462f43d3e32eff64d\n"
    },
    {
      "commit": "c948cfab40477b6daafb7c3e394b62129bcecf8e",
      "tree": "d8bb0cec657bd8e8ef72de7bde040baf061435ee",
      "parents": [
        "d350da9b4236d2d5fa7d7b73128997b9deeb8c90",
        "443f3aa138a36b9bde7dd4b9c61ac23384e7de5e"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Wed Jul 19 08:20:23 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 19 08:20:23 2017 +0000"
      },
      "message": "Merge \"ConnectivityServiceTest: fix testNetworkInfoOfTypeNone\" am: 24a2adfa27 am: f6883504c2 am: b1894abbc5\nam: 443f3aa138\n\nChange-Id: I7d3bfdf6d95d5db2d31439b5c3334569666864e1\n"
    },
    {
      "commit": "443f3aa138a36b9bde7dd4b9c61ac23384e7de5e",
      "tree": "e989a5992cf01b0ac6fe7c509dbcc8a0ca74f962",
      "parents": [
        "8e8d274ed09a2a89b9b0b96c8040af34138bc1df",
        "b1894abbc598cc88e275437bdd0ba577d64217eb"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Wed Jul 19 08:15:12 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 19 08:15:12 2017 +0000"
      },
      "message": "Merge \"ConnectivityServiceTest: fix testNetworkInfoOfTypeNone\" am: 24a2adfa27 am: f6883504c2\nam: b1894abbc5\n\nChange-Id: I458a0fdae874039e0f1d5cd38ed8ad0a1754bba9\n"
    },
    {
      "commit": "b1894abbc598cc88e275437bdd0ba577d64217eb",
      "tree": "6b1095cd55f1f2b293733af4569d01e64f593c82",
      "parents": [
        "04b48078e8b267f17f330f0fb29dda0c496c067f",
        "f6883504c28f72a4ad79ed43ac40f29c60aaf388"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Wed Jul 19 08:09:38 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 19 08:09:38 2017 +0000"
      },
      "message": "Merge \"ConnectivityServiceTest: fix testNetworkInfoOfTypeNone\" am: 24a2adfa27\nam: f6883504c2\n\nChange-Id: I432f419d1c8f93136a76cbadfd32018294b3e3d7\n"
    },
    {
      "commit": "f6883504c28f72a4ad79ed43ac40f29c60aaf388",
      "tree": "27efb44c9918ccadd0364e8b024ba1063051c5cb",
      "parents": [
        "d82cdb4624d436189f1e1c2c53ec0b6ebb792bd9",
        "24a2adfa2738bd531c0172166733a8d8c089fe01"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Wed Jul 19 08:04:48 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 19 08:04:48 2017 +0000"
      },
      "message": "Merge \"ConnectivityServiceTest: fix testNetworkInfoOfTypeNone\"\nam: 24a2adfa27\n\nChange-Id: I4be1d2ce67871c1e01364beca886fdd3af374321\n"
    },
    {
      "commit": "c1014509d8654e4abfcfb7ee1bcaf642c2a2b67b",
      "tree": "858aa9bae549b74cf0fea0a451a30e44f1839153",
      "parents": [
        "2627d4856be08bda40f6b50ba0974f8b875f4995"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Wed Jul 19 10:10:52 2017 +0900"
      },
      "committer": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Wed Jul 19 15:08:49 2017 +0900"
      },
      "message": "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone\n\nThis patch fixes a couple of flakyness issues with\ntestNetworkInfoOfTypeNone. It also fixes some typos and naming issues.\n\nBug: 62918393, 62918393\nTest: runtest frameworks-net\nChange-Id: I1c56557ab113d3ef57dbc06a6e882634d03c5b09\n"
    },
    {
      "commit": "31097a6341af2279ea0dd01528dc141f67cc7053",
      "tree": "85984e82e2c39906576dfce377f487ca4bb3947b",
      "parents": [
        "e8f67b50b31719a37c0b4dd0cfe2655cb2c585d1",
        "93c5a4b389831654c8cc6576637f63b58a012487"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Wed Jul 19 01:31:28 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 19 01:31:28 2017 +0000"
      },
      "message": "Merge \"IpManager: fix test for default ProvisioningConfiguration\" am: 2627d4856b am: 361162b636 am: fe88fa947e\nam: 93c5a4b389\n\nChange-Id: I7c66b30f5f7961900c3b5a5baf0c14644cbcb69e\n"
    },
    {
      "commit": "93c5a4b389831654c8cc6576637f63b58a012487",
      "tree": "0e6ada72002e7d7121d254af8a96dcaa378a0d4b",
      "parents": [
        "ca624861a6039b87034aa27525d6879d51412fbf",
        "fe88fa947e93ccf146151d115abe41f30c628507"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Wed Jul 19 01:22:59 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 19 01:22:59 2017 +0000"
      },
      "message": "Merge \"IpManager: fix test for default ProvisioningConfiguration\" am: 2627d4856b am: 361162b636\nam: fe88fa947e\n\nChange-Id: I4bbbf0997f5bf9a1ebba1eb9968471fff9f297fe\n"
    },
    {
      "commit": "fe88fa947e93ccf146151d115abe41f30c628507",
      "tree": "fda00bafbb875cf496580f91c67e30eb91aac675",
      "parents": [
        "ad737afc4ce42f1ee86fc138058c23b0c8d4703c",
        "361162b6367eaffb3ecc779b893f07289e451c25"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Wed Jul 19 01:15:12 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 19 01:15:12 2017 +0000"
      },
      "message": "Merge \"IpManager: fix test for default ProvisioningConfiguration\" am: 2627d4856b\nam: 361162b636\n\nChange-Id: Id72cd94c481bdc106ed022582399687b9abcc22b\n"
    },
    {
      "commit": "361162b6367eaffb3ecc779b893f07289e451c25",
      "tree": "736272ba732d0133baa0d259a687f86325c7e742",
      "parents": [
        "6b0e6946c3e1cf65e0b9f6b45902551ea1cf9e62",
        "2627d4856be08bda40f6b50ba0974f8b875f4995"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Wed Jul 19 01:06:59 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 19 01:06:59 2017 +0000"
      },
      "message": "Merge \"IpManager: fix test for default ProvisioningConfiguration\"\nam: 2627d4856b\n\nChange-Id: I087aee995858ae898f5d660c11552724a07503c3\n"
    },
    {
      "commit": "2627d4856be08bda40f6b50ba0974f8b875f4995",
      "tree": "189d0a0fa3b6f1082a4e92f5e78ad3ca2de39115",
      "parents": [
        "777c408a220a0bc75b207ab7684b4fba84e1d316",
        "c10fe5f463676a05ecd3f76a5f7037700ea49b0d"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed Jul 19 00:58:11 2017 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Jul 19 00:58:11 2017 +0000"
      },
      "message": "Merge \"IpManager: fix test for default ProvisioningConfiguration\""
    },
    {
      "commit": "6a5fe34edfa75c4282db6fade142d582b0c8cd92",
      "tree": "4128d617d6bd2468852518947bfc5ed1666c6db8",
      "parents": [
        "f947a122cb4844b94f09a413d4cb7110a5f32553",
        "8228eb34462cc9f76152bc87e20e721cd0e20775"
      ],
      "author": {
        "name": "Lorenzo Colitti",
        "email": "lorenzo@google.com",
        "time": "Tue Jul 18 23:37:57 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 18 23:37:57 2017 +0000"
      },
      "message": "resolve merge conflicts of a1d67fb38ec0 to stage-aosp-master\nam: 8228eb3446\n\nChange-Id: Ic9ba31da8e5281c9dbc8fa7ff56a63956a495b72\n"
    },
    {
      "commit": "8228eb34462cc9f76152bc87e20e721cd0e20775",
      "tree": "a115c75683da01b49d0fce878a2547e0aac3a1c7",
      "parents": [
        "709f3c1d4660cbf8bbdf5f86278588113a57c91e",
        "a1d67fb38ec02150d674bc3b8d8354b53417552b"
      ],
      "author": {
        "name": "Lorenzo Colitti",
        "email": "lorenzo@google.com",
        "time": "Wed Jul 19 06:17:33 2017 +0900"
      },
      "committer": {
        "name": "Lorenzo Colitti",
        "email": "lorenzo@google.com",
        "time": "Wed Jul 19 07:35:31 2017 +0900"
      },
      "message": "resolve merge conflicts of a1d67fb38ec0 to stage-aosp-master\n\nTest: make -j64 services\nChange-Id: I3955b01189993f3051c608bc5d07a87e4e3b5f0b\nMerged-In: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa\n"
    },
    {
      "commit": "3698fc8ea6254c18a87fa6bb5cf459c04c7bcf68",
      "tree": "8746399baf8c70d37c3daa41f2b987b33d1af44f",
      "parents": [
        "91936a1d06641c26158bf074a135363082fd4213",
        "11e0e33756c549ee1bd99b5f940e55eab5b10c5c"
      ],
      "author": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Tue Jul 18 20:34:49 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 18 20:34:49 2017 +0000"
      },
      "message": "Merge \"Don\u0027t recycle bitmaps we don\u0027t own\" into oc-dr1-dev am: bc907cf9a8\nam: 11e0e33756\n\nChange-Id: Ifcb92445f6e8cda2a2c9eb4350be65937ea5787b\n"
    },
    {
      "commit": "11e0e33756c549ee1bd99b5f940e55eab5b10c5c",
      "tree": "d6f1bfe9430844ff8be97623ea853f051c8b542f",
      "parents": [
        "5ec6335b74ede6dd8fb72c216133b40265571699",
        "bc907cf9a8eb3dab10086a758f6202bf10215999"
      ],
      "author": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Tue Jul 18 20:24:53 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Jul 18 20:24:53 2017 +0000"
      },
      "message": "Merge \"Don\u0027t recycle bitmaps we don\u0027t own\" into oc-dr1-dev\nam: bc907cf9a8\n\nChange-Id: Ib5533fdbcfba36fc1ed82e0089cc681e73a02f05\n"
    },
    {
      "commit": "bc907cf9a8eb3dab10086a758f6202bf10215999",
      "tree": "76e2592ab1cbc2c1a2c3e6232ba501d41fbd3a29",
      "parents": [
        "d3320766365ed1fa74ebc5f751884fc28093e893",
        "42acf6009ade4314f3cd782d68db6ab7ad4c8da3"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Tue Jul 18 20:08:58 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Jul 18 20:08:58 2017 +0000"
      },
      "message": "Merge \"Don\u0027t recycle bitmaps we don\u0027t own\" into oc-dr1-dev"
    },
    {
      "commit": "fa9c0be3574ca20fa613f358c876500da90d885a",
      "tree": "252f0016cdcf8b17b86b19a9a0d5002e4531f1e4",
      "parents": [
        "3481d3d8e31d90f83b33815b5c58882a96c2169d",
        "3673863f3b2ec692201b7fb3089a1c05973e08e4"
      ],
      "author": {
        "name": "Charles He",
        "email": "qiurui@google.com",
        "time": "Tue Jul 18 18:47:45 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Jul 18 18:47:45 2017 +0000"
      },
      "message": "Merge \"Opt-out for always-on VPN\""
    },
    {
      "commit": "7e909308d2a6b395b2cc06d526cec81458f59aff",
      "tree": "cab61deac01cd038ab5d246d9ca900b0f8dc866e",
      "parents": [
        "9f02a4ee69ff56f964c8bf8aa3e4248c6aa60df4",
        "9f09e6a73df1748e980eff26a57e611d68c7ee9a"
      ],
      "author": {
        "name": "Jeff Sharkey",
        "email": "jsharkey@google.com",
        "time": "Tue Jul 18 16:17:02 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Jul 18 16:17:02 2017 +0000"
      },
      "message": "Merge \"Unify permissions under UPDATE_DEVICE_STATS.\""
    },
    {
      "commit": "9f02a4ee69ff56f964c8bf8aa3e4248c6aa60df4",
      "tree": "310347bc3039f6a57b2ee2012d9e4b378e0056ec",
      "parents": [
        "38d9ee4cd661c10e012f71051d23644c65607eed",
        "24250ef9481da08f26cdeb2ef7075783662f05ee"
      ],
      "author": {
        "name": "Tomasz Wasilczyk",
        "email": "twasilczyk@google.com",
        "time": "Tue Jul 18 16:15:17 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Jul 18 16:15:17 2017 +0000"
      },
      "message": "Merge \"Deprecate onMetadataChanged.\""
    },
    {
      "commit": "4ca0ba8f86f657f42ebae2d389f7a6f92251c01c",
      "tree": "59685f5a485344d13457665f9965a9c2ee9214db",
      "parents": [
        "07f1304cfe9efbde7f90895a948b3170a3f0d0ec"
      ],
      "author": {
        "name": "Lorenzo Colitti",
        "email": "lorenzo@google.com",
        "time": "Wed Jul 12 15:48:07 2017 +0900"
      },
      "committer": {
        "name": "Lorenzo Colitti",
        "email": "lorenzo@google.com",
        "time": "Wed Jul 19 00:55:37 2017 +0900"
      },
      "message": "Fetch tethering offload stats.\n\nMake tethering offload register an ITetheringStatsProvider and\nfetch tethering stats from the hardware.\n\nCurrently we fetch stats in the following cases:\n\n1. Just after changing upstreams, we fetch stats from the\n   previous upstream.\n2. When we are polled by NetworkStatsService.\n\n(cherry-picked from commit 5a7dea1a8eb2cf53fc1d5a52004647de94150e62)\n\nBug: 29337859\nBug: 32163131\nTest: builds, boots\nTest: stats appear in tethering logs\nChange-Id: If744f2e06cb6a3095a40199936b9afb76eff7b56\nMerged-In: If744f2e06cb6a3095a40199936b9afb76eff7b56\n"
    },
    {
      "commit": "38d9ee4cd661c10e012f71051d23644c65607eed",
      "tree": "0dda3bc5db88275e639f94e06e930bf0c74ff81f",
      "parents": [
        "3779fb5f575adb17152a27b1c86c658217f60a6d",
        "8cfb0e81fdd91b7fe1c02287394ac068287281d5"
      ],
      "author": {
        "name": "Tomasz Wasilczyk",
        "email": "twasilczyk@google.com",
        "time": "Tue Jul 18 15:36:22 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Jul 18 15:36:22 2017 +0000"
      },
      "message": "Merge \"Implement ProgramSelector for font-end Java APIs.\""
    },
    {
      "commit": "c10fe5f463676a05ecd3f76a5f7037700ea49b0d",
      "tree": "da0fca48c10b6f3d4912d6f687e4fa445ddd036e",
      "parents": [
        "d2c8dcfcfe4cdc4fb4d3d86a8a7e6e7d43fdd9c0"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Tue Jul 18 16:17:49 2017 +0900"
      },
      "committer": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Tue Jul 18 21:31:17 2017 +0900"
      },
      "message": "IpManager: fix test for default ProvisioningConfiguration\n\nThe test did not properly account for the stopAllIP() done in starting\nstate of the IpManager state machine, which could cause assertions to\nfail when stopAllIP() is called again after stop().\n\nBug: 62988545\nTest: runtest frameworks-net\nChange-Id: I2c6eb76461a81c1d743bf448da36c58a99ce082d\n"
    },
    {
      "commit": "ff6bce1e3c8d1c3a86dd6ac94e8b82a0dc3c33eb",
      "tree": "635750cfe717f3a1d25460e1da3d67b7474c5966",
      "parents": [
        "6105698cdaaf6e12291d9666c85f3178b9ced415",
        "822c5bf77892175d0b52aeaddf4e43c749c341f6"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Tue Jul 18 07:58:33 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue Jul 18 07:58:33 2017 +0000"
      },
      "message": "Merge \"IP connectivity metrics: fix tests after proto update\""
    },
    {
      "commit": "822c5bf77892175d0b52aeaddf4e43c749c341f6",
      "tree": "57dbca58ce4fd89a6858d908ef3579a2a9e42cbb",
      "parents": [
        "516e4d3c2b009bdf4e031513d6837e861e31fd62"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Tue Jul 18 14:28:27 2017 +0900"
      },
      "committer": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Tue Jul 18 14:33:12 2017 +0900"
      },
      "message": "IP connectivity metrics: fix tests after proto update\n\nUpdate to ipconnectivity.proto in commit\n6d2f506bfd788a3685292d404dc9d82a27357cfe broke the associated unit\ntests (Change-Id: I4cf5b95956df721aecd63fddfb026a7266c190b9)\n\nBug: 34901696\nTest: runtest frameworks-net\nChange-Id: I57a6bad8a9836b1c45690c4589b416786ce1dfa0\n"
    },
    {
      "commit": "3673863f3b2ec692201b7fb3089a1c05973e08e4",
      "tree": "906b7ca09045581374fe55cec1f78e4efa97481b",
      "parents": [
        "2ee0de2593740e3d60829b0f5d3d47bdfbc0ff4e"
      ],
      "author": {
        "name": "Charles He",
        "email": "qiurui@google.com",
        "time": "Mon May 15 17:07:18 2017 +0100"
      },
      "committer": {
        "name": "Charles He",
        "email": "qiurui@google.com",
        "time": "Tue Jul 18 00:55:38 2017 +0100"
      },
      "message": "Opt-out for always-on VPN\n\nAlways-on VPN is a feature introduced in N. Since then, all VPN apps\ntargeting N+ are assumed to support the feature, and the user or the DPC\ncan turn on / off always-on for any such VPN app. However, a few VPN\napps are not designed to support the always-on feature. Enabling\nalways-on for these apps will result in undefined behavior and confusing\n\"Always-on VPN disconnected\" notification.\n\nThis feature provides a new manifest meta-data field through which a VPN\napp can opt out of the always-on feature explicitly. This will stop the\nalways-on feature from being enabled for the app, both by the user and\nby the DPC, and will clear its existing always-on state.\n\nA @hide API is provided to check whether an app supports always-on VPN.\nDocumentation is updated to reflect the behavior change.\n\nBug: 36650087\nTest: runtest --path java/com/android/server/connectivity/VpnTest.java\nTest: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test \u0027com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAlwaysOnVpnUnsupportedPackage\u0027\nTest: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test \u0027com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAlwaysOnVpnUnsupportedPackageReplaced\u0027\nTest: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test \u0027com.android.cts.devicepolicy.MixedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackage\u0027\nTest: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test \u0027com.android.cts.devicepolicy.MixedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackageReplaced\u0027\nTest: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test \u0027com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackage\u0027\nTest: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test \u0027com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackageReplaced\u0027\n\nChange-Id: I477897a29175e3994d4ecf8ec546e26043c90f13\n"
    },
    {
      "commit": "24250ef9481da08f26cdeb2ef7075783662f05ee",
      "tree": "e70b52b1b3022beeb5ef59e0876ecbd66e547105",
      "parents": [
        "8cfb0e81fdd91b7fe1c02287394ac068287281d5"
      ],
      "author": {
        "name": "Tomasz Wasilczyk",
        "email": "twasilczyk@google.com",
        "time": "Thu Jul 13 15:59:08 2017 -0700"
      },
      "committer": {
        "name": "Tomasz Wasilczyk",
        "email": "twasilczyk@google.com",
        "time": "Mon Jul 17 16:28:17 2017 -0700"
      },
      "message": "Deprecate onMetadataChanged.\n\nAll ProgramInfo changes are passed now by onProgramInfoChanged callback.\n\nThe onMetadataChanged callback is still called for compatibility reasons.\n\nBug: b/32621193\nTest: instrumentalization (none added)\nChange-Id: I80be8d3b55614c618514ac1e081a3ba60f4060b3\n"
    },
    {
      "commit": "8cfb0e81fdd91b7fe1c02287394ac068287281d5",
      "tree": "40c1aec73b5b4a6886f59395aca998b9d27098f4",
      "parents": [
        "e83dbb90fa03173e80fba7de44adab9c023b93e6"
      ],
      "author": {
        "name": "Tomasz Wasilczyk",
        "email": "twasilczyk@google.com",
        "time": "Wed Jul 12 13:59:20 2017 -0700"
      },
      "committer": {
        "name": "Tomasz Wasilczyk",
        "email": "twasilczyk@google.com",
        "time": "Mon Jul 17 16:23:05 2017 -0700"
      },
      "message": "Implement ProgramSelector for font-end Java APIs.\n\nBug: b/32621193\nTest: instrumentalization\nChange-Id: Ibb9841fed76ef3568c2e36ca28ea31addf9175f1\n"
    },
    {
      "commit": "9f09e6a73df1748e980eff26a57e611d68c7ee9a",
      "tree": "cb742002214a750dd9fc490a1e9cd1ae464e4ce1",
      "parents": [
        "1d47c55407f539d7d57ed16bd088de0a79a6ad82"
      ],
      "author": {
        "name": "Jeff Sharkey",
        "email": "jsharkey@android.com",
        "time": "Mon Jun 26 11:24:47 2017 -0600"
      },
      "committer": {
        "name": "Jeff Sharkey",
        "email": "jsharkey@android.com",
        "time": "Mon Jul 17 16:10:55 2017 -0600"
      },
      "message": "Unify permissions under UPDATE_DEVICE_STATS.\n\nThe UPDATE_DEVICE_STATS permission has become the de-facto mechanism\nthat platform components use to shift blame for resource usage, so\nit\u0027s confusing to also have a separate MODIFY_NETWORK_ACCOUNTING\npermission.  So this change replaces MODIFY_NETWORK_ACCOUNTING with\nUPDATE_DEVICE_STATS.\n\nBug: 62483389\nTest: builds, boots\nExempt-From-Owner-Approval: Bug 63673347\nChange-Id: I872759f02327b6d531ec2338bd876890aded60ad\n"
    },
    {
      "commit": "42acf6009ade4314f3cd782d68db6ab7ad4c8da3",
      "tree": "066b26df1102f12551415df43ec1a595d914f137",
      "parents": [
        "ef94006264f6b3962b46d8e628d4ae21eed1e057"
      ],
      "author": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Thu Jul 13 16:32:44 2017 -0700"
      },
      "committer": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Mon Jul 17 16:35:29 2017 +0000"
      },
      "message": "Don\u0027t recycle bitmaps we don\u0027t own\n\nWallpaperColors#fromBitmap should only recycle the bitmaps\ncreated by itself.\n\nTest: runtest -x tests/Internal/src/android/app/WallpaperColorsTest.java\nFixes: 63758291\nChange-Id: I1710bf7118b6ae871442f9606f95ac9c9dbb7d24\n"
    },
    {
      "commit": "ca0c7831672bbb7c7c8e7fd2e2fed87e015aa088",
      "tree": "326177b216595052b636dc7777772249f3ddf985",
      "parents": [
        "b266d84df0d75aea90b9831fe5fb973650fdd8fe",
        "486ce65234872abe1a168a1ab51695f7d8ed7f1f"
      ],
      "author": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Fri Jul 14 20:39:22 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jul 14 20:39:22 2017 +0000"
      },
      "message": "Merge \"Move palette constants to XML\" into oc-dr1-dev am: 8d5b831095\nam: 486ce65234\n\nChange-Id: Ib2ff59f4ac52799d420ee3353cedb4762f7a02b1\n"
    },
    {
      "commit": "486ce65234872abe1a168a1ab51695f7d8ed7f1f",
      "tree": "c08798ba1177fcce053215130a8398440bfdf387",
      "parents": [
        "d33013ade3329e1ea4421e77bca29a445c3eb6af",
        "8d5b83109566c51e79c9f1b04dd9a66a3fcf2ea1"
      ],
      "author": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Fri Jul 14 20:31:33 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jul 14 20:31:33 2017 +0000"
      },
      "message": "Merge \"Move palette constants to XML\" into oc-dr1-dev\nam: 8d5b831095\n\nChange-Id: I8ced4304e4e6f6f766c7160e25122974ec0c9548\n"
    },
    {
      "commit": "8d5b83109566c51e79c9f1b04dd9a66a3fcf2ea1",
      "tree": "9e70fde25aedb35e6b80ca2a5399e0b639420f13",
      "parents": [
        "c0ce489df72ec216dd145369d3f8b39a105d7fc4",
        "6e69c85ddcf7abfc3d9105b319d782c3bbae2c7d"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Fri Jul 14 20:24:37 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Jul 14 20:24:37 2017 +0000"
      },
      "message": "Merge \"Move palette constants to XML\" into oc-dr1-dev"
    },
    {
      "commit": "6e69c85ddcf7abfc3d9105b319d782c3bbae2c7d",
      "tree": "8c7121657db4acd522a127b6429ad0fa2773d364",
      "parents": [
        "6a6d63be45e03b383235e29b712893891e2c2af0"
      ],
      "author": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Thu Jul 06 16:09:24 2017 -0700"
      },
      "committer": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Fri Jul 14 09:35:05 2017 -0700"
      },
      "message": "Move palette constants to XML\n\nTest: runtest -x tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java\nChange-Id: I22a5ef9b89c113f75261e8884fa1affb07b2265f\nFixes: 62373429\n"
    },
    {
      "commit": "f7a008ff693a9bdaf7ce1c071152f0f5d0342692",
      "tree": "e9d1447d5f657c6d4125620ec73d0eb1cf5affd9",
      "parents": [
        "0ce595353452551220d9033b63d48e66945e8976",
        "041111ff7e6157c153f186de49c4eb17f55e3c21"
      ],
      "author": {
        "name": "Lorenzo Colitti",
        "email": "lorenzo@google.com",
        "time": "Fri Jul 14 01:06:56 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jul 14 01:06:56 2017 +0000"
      },
      "message": "Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev am: 3756636ad6\nam: 041111ff7e\n\nChange-Id: I538f7faef85bbb13499dec2125e0f82b3175396f\n"
    },
    {
      "commit": "041111ff7e6157c153f186de49c4eb17f55e3c21",
      "tree": "cedffdedeeebbefc319a267713b13b905885ef52",
      "parents": [
        "d792c31806af9981c5bdeb536bf0d33aa63b6c53",
        "3756636ad67e50262400e6670f0f15883935b158"
      ],
      "author": {
        "name": "Lorenzo Colitti",
        "email": "lorenzo@google.com",
        "time": "Fri Jul 14 01:01:29 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jul 14 01:01:29 2017 +0000"
      },
      "message": "Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev\nam: 3756636ad6\n\nChange-Id: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa\n"
    },
    {
      "commit": "3756636ad67e50262400e6670f0f15883935b158",
      "tree": "fa26df40a3e20f838bc8f5078cf7373352f0a785",
      "parents": [
        "dd74c1a8cd36d9a41a8ac3f38b4c296738132298",
        "c2519c5feae397e18561e00acea9d5e456bfaabe"
      ],
      "author": {
        "name": "Lorenzo Colitti",
        "email": "lorenzo@google.com",
        "time": "Fri Jul 14 00:51:56 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri Jul 14 00:51:56 2017 +0000"
      },
      "message": "Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev\n\n* changes:\n  Add code to dump OffloadController state.\n  Fetch tethering offload stats.\n  Allow more than one source of tethering statistics.\n"
    },
    {
      "commit": "a30cb89dfa6b04b86d9bf0b207e91f5c0c413933",
      "tree": "b2eb41d8e5e289cbabc57abbc3fe9e7c30e451e1",
      "parents": [
        "0e015132938744f9bd116ec76094bac07719b153",
        "164ff8a2ed2668aaf76ddabf1c050c156ebb662a"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Fri Jul 14 00:46:49 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jul 14 00:46:49 2017 +0000"
      },
      "message": "resolve merge conflicts of 4f2a0fe213e5 to stage-aosp-master am: a428392c1d\nam: 164ff8a2ed\n\nChange-Id: I08195e119f866acc9fe1795b892fe45cea3c7f47\n"
    },
    {
      "commit": "164ff8a2ed2668aaf76ddabf1c050c156ebb662a",
      "tree": "64c868c8518de02d63d3378196111e167a4b5fa3",
      "parents": [
        "9cdec3943ca6752046c880051704dbb37b2faf18",
        "a428392c1ddb93cabf0186ea0507b1fbc5254c60"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Fri Jul 14 00:37:20 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Jul 14 00:37:20 2017 +0000"
      },
      "message": "resolve merge conflicts of 4f2a0fe213e5 to stage-aosp-master\nam: a428392c1d\n\nChange-Id: Ide67520d074330ec050ded71118bff0bc88be784\n"
    },
    {
      "commit": "a428392c1ddb93cabf0186ea0507b1fbc5254c60",
      "tree": "bf4c6024d1456f06da1849be5639c14d61c785bf",
      "parents": [
        "791a698a6a5f6c6e8b37f43c38f0027af9ee70be",
        "4f2a0fe213e56d1eb4221a02a09571262ef8036a"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Fri Jul 14 07:25:51 2017 +0900"
      },
      "committer": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Fri Jul 14 07:25:51 2017 +0900"
      },
      "message": "resolve merge conflicts of 4f2a0fe213e5 to stage-aosp-master\n\nTest: I solemnly swear I tested this conflict resolution.\nChange-Id: I61cfb2d4798350f28f1bb36aed67ee8f18895031\n"
    },
    {
      "commit": "e83dbb90fa03173e80fba7de44adab9c023b93e6",
      "tree": "7dd840ecb7280474c5181b0f1bfe83cb1033f097",
      "parents": [
        "a8519d2f63be8e1e1c7f46a25dd750a4364ba559",
        "05392d6360b89538aa8fcbb1afd50775adfadcf4"
      ],
      "author": {
        "name": "Tomasz Wasilczyk",
        "email": "twasilczyk@google.com",
        "time": "Thu Jul 13 20:50:10 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Jul 13 20:50:10 2017 +0000"
      },
      "message": "Merge \"Publish new Broadcast Radio APIs.\""
    },
    {
      "commit": "4f2a0fe213e56d1eb4221a02a09571262ef8036a",
      "tree": "82f02c150a2deb5a7d519bca891779f1bd3163c5",
      "parents": [
        "d8dab115478e46440b7d97d8f70d41fb64efd0a1",
        "fd31b9d46ea09dc7d74ddc03ab7e5ecfbe80b3dc"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu Jul 13 20:45:21 2017 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Thu Jul 13 20:45:21 2017 +0000"
      },
      "message": "Merge \"IpManager: define InitialConfiguration\""
    },
    {
      "commit": "6fea738bebe73892cd3a06e27342fd0eb38c2c50",
      "tree": "5836a4d3e083d8b81c4f6eae9fcc5bfa3d651ddb",
      "parents": [
        "6fef520af55c3f0271a9401177fcfa596eaec871",
        "c694d0468258ef4a4e8584fa81d34a97d632066c"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu Jul 13 20:03:11 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Jul 13 20:03:11 2017 +0000"
      },
      "message": "Merge \"Remove AppCompat from TouchLatency test\""
    },
    {
      "commit": "fd31b9d46ea09dc7d74ddc03ab7e5ecfbe80b3dc",
      "tree": "f113067dca4697fea38ddfe75457ca59ebb4f6dc",
      "parents": [
        "5bb30496cf381c6546cbf02a2c5b55adf046aeb8"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Fri Jun 23 10:07:08 2017 +0900"
      },
      "committer": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Fri Jul 14 04:26:42 2017 +0900"
      },
      "message": "IpManager: define InitialConfiguration\n\nThis patch adds a InitialConfiguration class to IpManager for specifying\nIP information in IpManager ProvisioningConfiguration at IpManager\nstartup.\n\nAt the moment this InitialConfiguration is not used, but is validated in\nstartProvsiioning if ProvisioningConfiguration includes one. It will be\nintegrated into IpManager IP provisioning logic in follow-up patches.\n\nThis patch also includes an example of data driven unit tests using a\ntable of test case. The highlights of this methodology are:\n  1) easy extensibility for new test case,\n  2) rich and informative error messages,\nUnfortunately Java support for inlined data structure literals is poor\nand some companion static methods for data generation are required for\nenabling this methodology.\n\nBug: 62988545\nTest: added new test in FrameworksNetTests,\n      $ runtest frameworks-net\n      $ runtest frameworks-wifi\nMerged-In: I060b02603af7d73a6407df89344bf0c000574af2\n\n(cherry pick of commit 2757fcf3a13b0addc4a168a12c72ac2fc418b012)\n\nChange-Id: I48dbf89232d7758f1b07ed4d76ce93281e5c6b53\n"
    },
    {
      "commit": "6ea667447d940068d6e12b19ee9e8b332b1bdea1",
      "tree": "f7c65aad7fb65d49ff2b59d88553dbbd20d6d59c",
      "parents": [
        "39c9e18721729c38252e8dd5f2d2736aa145c67d",
        "6390f888de30b7560b2838629011ceb76ff574a1"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu Jul 13 18:43:13 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Jul 13 18:43:13 2017 +0000"
      },
      "message": "Merge \"Added mediumTest annotation to execute on tradefed.\""
    },
    {
      "commit": "c7a0402c6ecfba9d4f10707b42b1bd3cbac6f829",
      "tree": "1ae456c18b32eea0d92bf217ac825da02314a0b2",
      "parents": [
        "cd2d38d65e738735698319ae0576ae23201e71c0",
        "de3597c769edef1051b81f3c32c565d6b885b0bb"
      ],
      "author": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Thu Jul 13 17:19:05 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jul 13 17:19:05 2017 +0000"
      },
      "message": "Merge \"In-app gradient color based on systemui theme.\" into oc-dr1-dev am: 717dd58c52\nam: de3597c769\n\nChange-Id: I929d33ba540d03cdd823f0cf9a1b22b365fd9f2f\n"
    },
    {
      "commit": "de3597c769edef1051b81f3c32c565d6b885b0bb",
      "tree": "42a9ba66c96e8bc8da013a0bf80fe1862838a0a7",
      "parents": [
        "d4a3ca8d761037901f3b902b8752d0ef4f91ada9",
        "717dd58c5205f3ce90d004a70b5d4f20e16522b1"
      ],
      "author": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Thu Jul 13 17:09:59 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jul 13 17:09:59 2017 +0000"
      },
      "message": "Merge \"In-app gradient color based on systemui theme.\" into oc-dr1-dev\nam: 717dd58c52\n\nChange-Id: I35c7baae2e373f4d8bea87d1afc175833de7f59e\n"
    },
    {
      "commit": "717dd58c5205f3ce90d004a70b5d4f20e16522b1",
      "tree": "097397b9f60f26d61a960235e70dd8e0d201ee98",
      "parents": [
        "ac77186d349480edaea3c513dc4cae672fda7d0c",
        "c77b71d7f06234264041d0dc781189574acb6d0b"
      ],
      "author": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Thu Jul 13 17:03:47 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Jul 13 17:03:47 2017 +0000"
      },
      "message": "Merge \"In-app gradient color based on systemui theme.\" into oc-dr1-dev"
    },
    {
      "commit": "b12dc4296d8b5be0a2062d6b3ea8deb92f615587",
      "tree": "0f9c50c60707e582c69818e2d1dd49d953ab3ade",
      "parents": [
        "e3fd65f9e582ae098dccc0d432387c39ee504f29",
        "2757fcf3a13b0addc4a168a12c72ac2fc418b012"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu Jul 13 15:36:34 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Jul 13 15:36:34 2017 +0000"
      },
      "message": "Merge \"IpManager: define InitialConfiguration\""
    },
    {
      "commit": "5a7dea1a8eb2cf53fc1d5a52004647de94150e62",
      "tree": "fe6bdf78e8ddfe9c2bded036351d99a91d510557",
      "parents": [
        "ef7b2a13ce4c34950b52de27dcf65b74388d7b3d"
      ],
      "author": {
        "name": "Lorenzo Colitti",
        "email": "lorenzo@google.com",
        "time": "Wed Jul 12 15:48:07 2017 +0900"
      },
      "committer": {
        "name": "Lorenzo Colitti",
        "email": "lorenzo@google.com",
        "time": "Thu Jul 13 23:54:51 2017 +0900"
      },
      "message": "Fetch tethering offload stats.\n\nMake tethering offload register an ITetheringStatsProvider and\nfetch tethering stats from the hardware.\n\nCurrently we fetch stats in the following cases:\n\n1. Just after changing upstreams, we fetch stats from the\n   previous upstream.\n2. When we are polled by NetworkStatsService.\n\nBug: 29337859\nBug: 32163131\nTest: builds, boots\nTest: stats appear in tethering logs\nChange-Id: If744f2e06cb6a3095a40199936b9afb76eff7b56\n"
    },
    {
      "commit": "05392d6360b89538aa8fcbb1afd50775adfadcf4",
      "tree": "c8aca7bc1f8d45fdfee0efe28a14a6d4ed245e0d",
      "parents": [
        "3c3acf8bf1f48d5a1d33282ff24be5e1300d3298"
      ],
      "author": {
        "name": "Tomasz Wasilczyk",
        "email": "twasilczyk@google.com",
        "time": "Mon Jul 10 19:33:22 2017 -0700"
      },
      "committer": {
        "name": "Tomasz Wasilczyk",
        "email": "twasilczyk@google.com",
        "time": "Thu Jul 13 07:46:25 2017 -0700"
      },
      "message": "Publish new Broadcast Radio APIs.\n\nAlso, rename FEATURE_RADIO to FEATURE_BROADCASTRADIO.\n\nBug: b/34348946\nBug: b/63405337\nTest: instrumentalization\nChange-Id: Ibf5851a10b94f9e82db85f740fde6f28efe48666\n"
    },
    {
      "commit": "2757fcf3a13b0addc4a168a12c72ac2fc418b012",
      "tree": "1e2d0c961b4757cb9c7ecb326daaca4b0616b2cf",
      "parents": [
        "08246c0aea5d32637360336c7651c76423b866d2"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Fri Jun 23 10:07:08 2017 +0900"
      },
      "committer": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Thu Jul 13 22:42:50 2017 +0900"
      },
      "message": "IpManager: define InitialConfiguration\n\nThis patch adds a InitialConfiguration class to IpManager for specifying\nIP information in IpManager ProvisioningConfiguration at IpManager\nstartup.\n\nAt the moment this InitialConfiguration is not used, but is validated in\nstartProvsiioning if ProvisioningConfiguration includes one. It will be\nintegrated into IpManager IP provisioning logic in follow-up patches.\n\nThis patch also includes an example of data driven unit tests using a\ntable of test case. The highlights of this methodology are:\n  1) easy extensibility for new test case,\n  2) rich and informative error messages,\nUnfortunately Java support for inlined data structure literals is poor\nand some companion static methods for data generation are required for\nenabling this methodology.\n\nBug: 62988545\nTest: added new test in FrameworksNetTests,\n      $ runtest frameworks-net\n      $ runtest frameworks-wifi\n\nChange-Id: I060b02603af7d73a6407df89344bf0c000574af2\n"
    },
    {
      "commit": "17a62281e4934a3f3818cd4c8f107a83599262c6",
      "tree": "768add8d7048ed7e94739fe795514798445eb9a4",
      "parents": [
        "cd816c1853302797c3fc7e703687e710d8d844c1",
        "ae21b8941453ce5973100671c2cb9ef9ff20394c"
      ],
      "author": {
        "name": "Erik Kline",
        "email": "ek@google.com",
        "time": "Thu Jul 13 09:07:01 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jul 13 09:07:01 2017 +0000"
      },
      "message": "Merge \"Program offload-exempt local prefixes into the HAL\" am: de837a97aa\nam: ae21b89414\n\nChange-Id: If96a33f26fed64a84219868d28765b7581ad453d\n"
    },
    {
      "commit": "ae21b8941453ce5973100671c2cb9ef9ff20394c",
      "tree": "f562e864f553e0d41134d4ccfecfcbb4432b38c4",
      "parents": [
        "8625194c19d6a2260b27c5c1870c66254c040c74",
        "de837a97aa9db9ae344a7c298012fa2c7b808b95"
      ],
      "author": {
        "name": "Erik Kline",
        "email": "ek@google.com",
        "time": "Thu Jul 13 09:00:56 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jul 13 09:00:56 2017 +0000"
      },
      "message": "Merge \"Program offload-exempt local prefixes into the HAL\"\nam: de837a97aa\n\nChange-Id: I741b6e31fb3adc922f47df824188786ff35e3aa9\n"
    },
    {
      "commit": "5acb4e3b62c788bff1baa22ecb20f6b103cc8d93",
      "tree": "eff67776e701b9bf3666d83677e4d0b60e82d54a",
      "parents": [
        "2fa880d0162a206b9307bfd5cd37a37cf216895a"
      ],
      "author": {
        "name": "Erik Kline",
        "email": "ek@google.com",
        "time": "Tue Jul 04 18:28:11 2017 +0900"
      },
      "committer": {
        "name": "Erik Kline",
        "email": "ek@google.com",
        "time": "Thu Jul 13 16:43:34 2017 +0900"
      },
      "message": "Program offload-exempt local prefixes into the HAL\n\nTest: as follows\n    - built\n    - flashed\n    - booted\n    - \"runtest frameworks-net\" passes\n    - observed calls to the HAL setLocalPrefixes in tethering log\nBug: 29337859\nBug: 32163131\nMerged-In: I3c3bd4ee83ffe86ddbe6a16fbbfa0756bf5064d4\nMerged-In: Iaf80e584df458010741401fc1a19e7f6e21923c1\nMerged-In: Ifaf23c6179ead9de6ccfcf41e0c203025153167b\n(cherry picked from commit 32179ff81511e00aef31e8fda705be3df074ece6)\n\nChange-Id: I65ea833ac6fe7a75ebe546cfa358c4cffdf2de05\n"
    },
    {
      "commit": "12973a4ec01989d6c957c997cb0ad6ae488ac8ff",
      "tree": "5ad7f9b8c6c9937fbd105f42750d10b109d293b0",
      "parents": [
        "953daa0a7832998b801c368db36f7fba197552f9",
        "b3d2aaaf2f0d5b5a0efa91679a387b128d488fc1"
      ],
      "author": {
        "name": "Erik Kline",
        "email": "ek@google.com",
        "time": "Thu Jul 13 07:41:52 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jul 13 07:41:52 2017 +0000"
      },
      "message": "Merge \"Program offload-exempt local prefixes into the HAL\" into oc-dr1-dev am: aa7b8b5322\nam: b3d2aaaf2f\n\nChange-Id: I3c3bd4ee83ffe86ddbe6a16fbbfa0756bf5064d4\n"
    },
    {
      "commit": "b3d2aaaf2f0d5b5a0efa91679a387b128d488fc1",
      "tree": "5c500f34044c5db9a9f762686992dad5f162ce7b",
      "parents": [
        "c2a76d16f0db793631dbcaf92adb0258cb8a56f9",
        "aa7b8b532271797ebaca6c816e95530d28fc995f"
      ],
      "author": {
        "name": "Erik Kline",
        "email": "ek@google.com",
        "time": "Thu Jul 13 07:36:50 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Jul 13 07:36:50 2017 +0000"
      },
      "message": "Merge \"Program offload-exempt local prefixes into the HAL\" into oc-dr1-dev\nam: aa7b8b5322\n\nChange-Id: Iaf80e584df458010741401fc1a19e7f6e21923c1\n"
    },
    {
      "commit": "32179ff81511e00aef31e8fda705be3df074ece6",
      "tree": "5ebbf92f6698230b94b785b28f9da301cc332d11",
      "parents": [
        "a781d471e2a9ac3f4e99934cd7e4b276f21b3493"
      ],
      "author": {
        "name": "Erik Kline",
        "email": "ek@google.com",
        "time": "Tue Jul 04 18:28:11 2017 +0900"
      },
      "committer": {
        "name": "Erik Kline",
        "email": "ek@google.com",
        "time": "Thu Jul 13 13:45:49 2017 +0900"
      },
      "message": "Program offload-exempt local prefixes into the HAL\n\nAdditionally:\n    - move mOffloadController into MasterTetherSM\n\nTest: as follows\n    - built\n    - flashed\n    - booted\n    - \"runtest frameworks-net\" passes\n    - observed calls to the HAL setLocalPrefixes in tethering log\nBug: 29337859\nBug: 32163131\nChange-Id: Ifaf23c6179ead9de6ccfcf41e0c203025153167b\n"
    },
    {
      "commit": "6390f888de30b7560b2838629011ceb76ff574a1",
      "tree": "cfe3e5a164ccae0c9123f4042da8d4fd93365cc2",
      "parents": [
        "f922271d4e1a6532e38748b666db8ed4f3059e17"
      ],
      "author": {
        "name": "smaraaosp",
        "email": "smara@google.com",
        "time": "Wed Jul 12 16:08:15 2017 -0700"
      },
      "committer": {
        "name": "smaraaosp",
        "email": "smara@google.com",
        "time": "Wed Jul 12 16:14:29 2017 -0700"
      },
      "message": "Added mediumTest annotation to execute on tradefed.\n\nTest: Executed test locally.\n\nChange-Id: Ib5dcdff1a689f0728fe8d005fa9683ee9120ae13\n"
    },
    {
      "commit": "c77b71d7f06234264041d0dc781189574acb6d0b",
      "tree": "a05a9bb2bd2eec2e89acd4e83031168c78ff2dcc",
      "parents": [
        "2b6d358d559f31e203f97af0865e67e24c59377b"
      ],
      "author": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Wed Jul 05 17:34:41 2017 -0700"
      },
      "committer": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Wed Jul 12 10:40:23 2017 -0700"
      },
      "message": "In-app gradient color based on systemui theme.\n\nWhen viewing your scrim on top of an app (wallpaper not visible),\nthe gradient color should be dark if your wallpaper is dark and\nlight if your wallpaper is light.\n\nChange-Id: I5f3aea5bf9ec066b7caecd7cadfd2814e3758bd1\nFixes: 63121129\nBug: 63365056\nTest: runtest -x tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java\nTest: runtest -x packages/SystemUI/tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java\n"
    },
    {
      "commit": "d21ad47d4336f1d39e13826a3e395c33247d7299",
      "tree": "73e112f4c708d6551205f6b6ac7e7f977ab85c16",
      "parents": [
        "ce4c57fd0e3014c5a26c1b8b43a61a1a728d8ea0",
        "c8b4ef85dc059026c99aeaeb21a98c93bbebca70"
      ],
      "author": {
        "name": "Erik Kline",
        "email": "ek@google.com",
        "time": "Wed Jul 12 06:25:04 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 12 06:25:04 2017 +0000"
      },
      "message": "Merge \"Restructure use of absent tether_offload_disabled setting\" am: 5bb30496cf\nam: c8b4ef85dc\n\nChange-Id: I2210e9d25a4e7c497b9383324e574c9f8aca0d6f\n"
    },
    {
      "commit": "c8b4ef85dc059026c99aeaeb21a98c93bbebca70",
      "tree": "b0e981abe8eb544c56d9234ece34a3b8700762ce",
      "parents": [
        "2a13286d8d60460d36a03f2e3a7861b7d88f1b68",
        "5bb30496cf381c6546cbf02a2c5b55adf046aeb8"
      ],
      "author": {
        "name": "Erik Kline",
        "email": "ek@google.com",
        "time": "Wed Jul 12 06:18:11 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 12 06:18:11 2017 +0000"
      },
      "message": "Merge \"Restructure use of absent tether_offload_disabled setting\"\nam: 5bb30496cf\n\nChange-Id: I9d1ec7d1c060278018c80c9374d724ee0ddba3a4\n"
    },
    {
      "commit": "5bb30496cf381c6546cbf02a2c5b55adf046aeb8",
      "tree": "b477c7473b56d163326cfd419518f4da73ff050a",
      "parents": [
        "ba8ab362ad844fc5a53d2bfc40b5456862c1e52b",
        "5eaa7ed03b694b475c1d7760591dbd8010af2d32"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed Jul 12 06:06:07 2017 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Wed Jul 12 06:06:07 2017 +0000"
      },
      "message": "Merge \"Restructure use of absent tether_offload_disabled setting\""
    },
    {
      "commit": "5eaa7ed03b694b475c1d7760591dbd8010af2d32",
      "tree": "84d75e9dbb590b564bec03669e750dd2502fa9d5",
      "parents": [
        "cf188f664a71c135c383143a7bb8b50a44fde64a"
      ],
      "author": {
        "name": "Erik Kline",
        "email": "ek@google.com",
        "time": "Fri Jul 07 17:38:30 2017 +0900"
      },
      "committer": {
        "name": "Erik Kline",
        "email": "ek@google.com",
        "time": "Wed Jul 12 13:29:22 2017 +0900"
      },
      "message": "Restructure use of absent tether_offload_disabled setting\n\nThis restructures the fetching of the default disposition such\nthat we disable (and enable) the feature with only a single\ncharacter change.\n\nAdditionally: fix unittests with proper use of FakeSettingsProvider.\n\nTest: as follows\n    - built\n    - flashed\n    - booted\n    - \"runtest frameworks-net\" passed with developer enabled and disabled\nBug: 29337859\nBug: 32163131\nBug: 63250751\n(cherry picked from commit c87cd411843484225897ebdf91cd05073c1c5f35)\nMerged-In: Ib32489d07778465134bca52c589baddbd78ab129\nMerged-In: I03d68b0da192fbd6172639343d4ab88c20127ad7\nMerged-In: I10c0af2b2c4f6b6e613380e637cc3acb1f7a55a3\n\nChange-Id: Ie16a022be8dacd76b0402bcb777680c36163a084\n"
    },
    {
      "commit": "4cbefd0acaf7014e91592e3408e43e18d95f7373",
      "tree": "731b3913e17ec1a5f3090670efe7cb20ceba8917",
      "parents": [
        "b82e0abdc439f66d7dc596a8bf35268954a9ac76",
        "5185c1ce926132f16321a311eb3367d6a071138b"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Wed Jul 12 04:13:53 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 12 04:13:53 2017 +0000"
      },
      "message": "Merge \"Add first OWNERS files for core networking\" am: 4066930a36 am: 531cae76fd am: 59de81533d\nam: 5185c1ce92\n\nChange-Id: I3d0b7bcc72c21485671602d1e6f185fbc7702fe2\n"
    },
    {
      "commit": "5185c1ce926132f16321a311eb3367d6a071138b",
      "tree": "a6137f876896d5a44bacf389bd7c4d1552ee8b0a",
      "parents": [
        "5dbd36d6c27e142b7cbb365731eaff677e3af580",
        "59de81533db2c71cc86c101967e292006bf8dab5"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Wed Jul 12 04:07:18 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 12 04:07:18 2017 +0000"
      },
      "message": "Merge \"Add first OWNERS files for core networking\" am: 4066930a36 am: 531cae76fd\nam: 59de81533d\n\nChange-Id: Id149a16336fd5adfe8b247bb4b116db1ee357653\n"
    },
    {
      "commit": "59de81533db2c71cc86c101967e292006bf8dab5",
      "tree": "e7ed466d6cf31c24aa13fbc18bde6d6cee285c30",
      "parents": [
        "5987ab35cacb508fdeaaed0ee299e540566f9c5c",
        "531cae76fddc0ca8c58ae55bb6d2568dbe1732eb"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Wed Jul 12 04:01:15 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 12 04:01:15 2017 +0000"
      },
      "message": "Merge \"Add first OWNERS files for core networking\" am: 4066930a36\nam: 531cae76fd\n\nChange-Id: I099ee71d8b9ed767af2f4556e4798a1263dab9c0\n"
    },
    {
      "commit": "531cae76fddc0ca8c58ae55bb6d2568dbe1732eb",
      "tree": "5d8bd48c3baf6d7213d15dbbe2e782778dfa2815",
      "parents": [
        "8a4be2a6aebbdcfa576b82e544fc501112ebab35",
        "4066930a367e56fa4743f5c10f7fbc045f0b8486"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Wed Jul 12 03:54:57 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 12 03:54:57 2017 +0000"
      },
      "message": "Merge \"Add first OWNERS files for core networking\"\nam: 4066930a36\n\nChange-Id: Ib8e1b85be03ad5e75a89a7951a59b9bc2a04d112\n"
    },
    {
      "commit": "f042abe8f43788b7ed6fd2e681a1979c5160f10b",
      "tree": "56496f1e60acfb746f07a25360045edf3b6c5763",
      "parents": [
        "772df1cf6648013a0cfb68fb26f6dee26c5f6f7d",
        "9d9b5c22f16dc0c65a1f8cad8c3d4bfbab9728c2"
      ],
      "author": {
        "name": "Erik Kline",
        "email": "ek@google.com",
        "time": "Wed Jul 12 03:19:48 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 12 03:19:48 2017 +0000"
      },
      "message": "Merge \"Restructure use of absent tether_offload_disabled setting\" into oc-dr1-dev am: d8fdb26ebf\nam: 9d9b5c22f1\n\nChange-Id: I10c0af2b2c4f6b6e613380e637cc3acb1f7a55a3\n"
    },
    {
      "commit": "9d9b5c22f16dc0c65a1f8cad8c3d4bfbab9728c2",
      "tree": "aecdb1d876006cb7a3b95708ad63ffbaf439993f",
      "parents": [
        "10307ebe1f8348b62891249bb2c6fa396ab07790",
        "d8fdb26ebfd5c9037ad4e0b97995f280d7a83b8f"
      ],
      "author": {
        "name": "Erik Kline",
        "email": "ek@google.com",
        "time": "Wed Jul 12 03:11:15 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Jul 12 03:11:15 2017 +0000"
      },
      "message": "Merge \"Restructure use of absent tether_offload_disabled setting\" into oc-dr1-dev\nam: d8fdb26ebf\n\nChange-Id: I03d68b0da192fbd6172639343d4ab88c20127ad7\n"
    },
    {
      "commit": "357b58cdabc39f6231097d642aa2360bf42c21c7",
      "tree": "d93ea724eee9e8edade20a66f00d3a2573227249",
      "parents": [
        "ed0e6009df5ecd3132ae44d24b0f442eb1b981ff"
      ],
      "author": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Fri Jul 07 11:55:41 2017 +0900"
      },
      "committer": {
        "name": "Hugo Benichi",
        "email": "hugobenichi@google.com",
        "time": "Wed Jul 12 09:25:15 2017 +0900"
      },
      "message": "Add first OWNERS files for core networking\n\nCovering\n  core/java/android/net/\n  core/java/com/android/server/net/\n  packages/CaptivePortalLogin/\n  services/core/java/com/android/server/\n    ConnectivityService.java\n    NsdServic.java\n    NetworkManagementService.java\n  services/core/java/com/android/server/connectivity/\n  services/net/\n  tests/net/\n\nAndroid core networking files not covered:\n  services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp\n  services/core/proto/ipconnectivity.proto (path unique to aosp)\n\nBug: 63408147\nTest: builds\nChange-Id: Ifbb923d5ffdcada83864b5e0eb07911682d66efa\n"
    },
    {
      "commit": "4dd7c58fc8fcc5a2c50de5e8eff05ddc5c3b0b8b",
      "tree": "5047b723e68a665a9b598e90d79aaa12ac068756",
      "parents": [
        "0a2ada5416e01f762909c676b7edacb2a4104eac"
      ],
      "author": {
        "name": "Ahmed ElArabawy",
        "email": "arabawy@google.com",
        "time": "Mon Jun 12 18:01:11 2017 -0700"
      },
      "committer": {
        "name": "Ahmed ElArabawy",
        "email": "arabawy@google.com",
        "time": "Tue Jul 11 22:16:16 2017 +0000"
      },
      "message": "Add Configuration to APF Policy\n\nin b/37702435 battery was drained due to reception of\nEthernet frames with Eth-type \u003c 0x600 (non ehternet II frames)\n\nThis change adds an XML file to drop/allow these frames\nDropping helps tp avoid acquiring a wakelock for the\nreception of these packets, while allowing them may be needed\nfor some protocols\nThe Change allow the OEM to override the system settings\n\nBug: 37702435\nTest: runtest frameworks-net\nMerged-In: Idb6c215896ef230a8136ff4ecefc90ccdc5c1c6d\n\nChange-Id: Idb6c215896ef230a8136ff4ecefc90ccdc5c1c6d\nSigned-off-by: Ahmed ElArabawy \u003carabawy@google.com\u003e\n"
    },
    {
      "commit": "c87cd411843484225897ebdf91cd05073c1c5f35",
      "tree": "938b764ca0976050e0e0c43148cb404cbd762bc9",
      "parents": [
        "8b44d3722dde9fcd85acce2e190135c1684759d9"
      ],
      "author": {
        "name": "Erik Kline",
        "email": "ek@google.com",
        "time": "Fri Jul 07 17:38:30 2017 +0900"
      },
      "committer": {
        "name": "Erik Kline",
        "email": "ek@google.com",
        "time": "Tue Jul 11 23:46:58 2017 +0900"
      },
      "message": "Restructure use of absent tether_offload_disabled setting\n\nThis restructures the fetching of the default disposition such\nthat we disable (and enable) the feature with only a single\ncharacter change.\n\nAdditionally: fix unittests with proper use of FakeSettingsProvider.\n\nTest: as follows\n    - built\n    - flashed\n    - booted\n    - \"runtest frameworks-net\" passed with developer enabled and disabled\nBug: 29337859\nBug: 32163131\nBug: 63250751\n\nChange-Id: Ib32489d07778465134bca52c589baddbd78ab129\n"
    },
    {
      "commit": "ccf86f20cd03828cbf349ae08e09a72ed52678bb",
      "tree": "ad5041b8ed52631bf61f26b6fec603992645e6e7",
      "parents": [
        "de295549d194916a049b2c875fcc1abf0f1a91fa"
      ],
      "author": {
        "name": "Ian Lake",
        "email": "ilake@google.com",
        "time": "Mon Jul 10 17:04:37 2017 -0700"
      },
      "committer": {
        "name": "Ian Lake",
        "email": "ilake@google.com",
        "time": "Mon Jul 10 17:04:37 2017 -0700"
      },
      "message": "Delete MusicBrowserDemo+MusicServiceDemo\n\nThese have been supplanted by the\nMediaBrowserService sample in\nplatforms/developers/samples/android/media\n\nTest: ls, make sure they are gone\nBUG: 28983951\nChange-Id: Ib7388ed92695bf1de29182860b28b4da3752b39c\n"
    },
    {
      "commit": "c694d0468258ef4a4e8584fa81d34a97d632066c",
      "tree": "d3c10be5ba9221eeda215aeb74c0951c7d1b10d4",
      "parents": [
        "de295549d194916a049b2c875fcc1abf0f1a91fa"
      ],
      "author": {
        "name": "Ian Lake",
        "email": "ilake@google.com",
        "time": "Mon Jul 10 10:44:59 2017 -0700"
      },
      "committer": {
        "name": "Ian Lake",
        "email": "ilake@google.com",
        "time": "Mon Jul 10 18:12:46 2017 +0000"
      },
      "message": "Remove AppCompat from TouchLatency test\n\nEnsure the TouchLatency test accurately reflects the latest\nframework and removes the need to update TouchLatency test\nas Support Library evolves.\n\nTest: ./gradlew assembleDebug works\nBUG: 28983951\nChange-Id: Icce773f47674f94cad5f9057cce4913b7efce834\n"
    },
    {
      "commit": "ed7b5c64e0c2eabd044f363c75ba4ae139fc8a70",
      "tree": "a06cac444cb9dae811e3369b8c31263b57b81804",
      "parents": [
        "0407c1259c0e2b67274d92b8357f91cf925941f6",
        "8d4cd22ffb79a9f70bd3ecf78c95e056d3643661"
      ],
      "author": {
        "name": "Julia Reynolds",
        "email": "juliacr@google.com",
        "time": "Mon Jul 10 17:14:57 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Jul 10 17:14:57 2017 +0000"
      },
      "message": "Merge \"Limit the number of notis an app can enqueue\" into oc-dr1-dev am: c65071d625\nam: 8d4cd22ffb\n\nChange-Id: I60ddda50a6d5a6a3028361435a340d6191f6c729\n"
    },
    {
      "commit": "0407c1259c0e2b67274d92b8357f91cf925941f6",
      "tree": "6f4f4728d3bca3ecc533c14988b407315d87385a",
      "parents": [
        "34149bad4eac7eca3793cb4859f6387fe5cee431",
        "a9682937b6996e72ff96ccd5ae50440e0232eee4"
      ],
      "author": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Mon Jul 10 17:06:33 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Jul 10 17:06:33 2017 +0000"
      },
      "message": "Merge \"Add theme style flag to WallpaperColors\" into oc-dr1-dev am: 8b94ef697e\nam: a9682937b6\n\nChange-Id: Id3a0cd1c34166f156d0c94b412ca7d9397e38672\n"
    },
    {
      "commit": "8d4cd22ffb79a9f70bd3ecf78c95e056d3643661",
      "tree": "3a85b233a83d12241dccbc4ba16251d9257e45a4",
      "parents": [
        "a9682937b6996e72ff96ccd5ae50440e0232eee4",
        "c65071d62521fcd2a712f7380bf063d1e18fdf45"
      ],
      "author": {
        "name": "Julia Reynolds",
        "email": "juliacr@google.com",
        "time": "Mon Jul 10 17:06:23 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Jul 10 17:06:23 2017 +0000"
      },
      "message": "Merge \"Limit the number of notis an app can enqueue\" into oc-dr1-dev\nam: c65071d625\n\nChange-Id: I85e7117a88be1a629a953f1c721faba508d6d424\n"
    },
    {
      "commit": "a9682937b6996e72ff96ccd5ae50440e0232eee4",
      "tree": "b694a823b029e7785b813ce6fe1e446d8014d608",
      "parents": [
        "685525ed0a166dcc40287b6321e2d5111b457acb",
        "8b94ef697ed1256d427f9fc82d64146d6dcd571e"
      ],
      "author": {
        "name": "Lucas Dupin",
        "email": "dupin@google.com",
        "time": "Mon Jul 10 16:58:46 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Jul 10 16:58:46 2017 +0000"
      },
      "message": "Merge \"Add theme style flag to WallpaperColors\" into oc-dr1-dev\nam: 8b94ef697e\n\nChange-Id: Ic63c9dc9963846afd2ab854630d56512059609d9\n"
    }
  ],
  "next": "c65071d62521fcd2a712f7380bf063d1e18fdf45"
}