)]}'
{
  "log": [
    {
      "commit": "11be9317efffafcac52cd2dc5cce1d951c966dd1",
      "tree": "dda14779d25fc5e71e760c29b3c9dd3723c4143a",
      "parents": [
        "c6284379a5dde6bc5927409eff292db2f0add578"
      ],
      "author": {
        "name": "Alan Viverette",
        "email": "alanv@google.com",
        "time": "Thu Nov 09 15:41:44 2017 -0500"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Mon Dec 04 17:37:28 2017 -0800"
      },
      "message": "AAPT v1 embed compile SDK version and codename into app\n\nAlso adds support for dumping compile SDK attributes.\n\nBug: 63388434\nFixes: 68854953\nTest: manual, compiled \u0026 dumped ApiDemos APK\nChange-Id: I2eef812bd957950cdef5f1257b73b57044a1e731\n"
    },
    {
      "commit": "f4165c4cf7a4152a5ef34856a53f7a7757483020",
      "tree": "d8a799a1548fbaee94ca3a0ac461d6e0829601a4",
      "parents": [
        "00d31c2760629e18088bcbfe2fe1c01e266bb866",
        "ab2a38c03d54fad1ed0873ac091959ee38823cd6"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Mon Oct 16 19:30:04 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Oct 16 19:30:04 2017 +0000"
      },
      "message": "Merge \"AAPT leave \u003cgradient\u003e alone for VDC\""
    },
    {
      "commit": "ab2a38c03d54fad1ed0873ac091959ee38823cd6",
      "tree": "5a360c6adc7e4e733e2a5d1d326a9b993ba5f20d",
      "parents": [
        "404f23d6d0950754f4d4d65606379889c922a3eb"
      ],
      "author": {
        "name": "ztenghui",
        "email": "ztenghui@google.com",
        "time": "Fri Oct 13 15:56:08 2017 -0700"
      },
      "committer": {
        "name": "ztenghui",
        "email": "ztenghui@google.com",
        "time": "Mon Oct 16 10:34:27 2017 -0700"
      },
      "message": "AAPT leave \u003cgradient\u003e alone for VDC\n\nbug: 62421666\nTest: Tested with changes for Gradient of VDC.\n\nChange-Id: I07b39721aeaaafd888416a0f71f6cbd5fce97732\n"
    },
    {
      "commit": "d1ac6e1f9ea3a4d6c0d6d4a118c61526b8234a5f",
      "tree": "8e9697838fb471962de098194c91519e71863069",
      "parents": [
        "96a30ab84c9e856cd7152d66d603205c3daff36e"
      ],
      "author": {
        "name": "Donald Chai",
        "email": "dchai@google.com",
        "time": "Thu Oct 12 21:00:45 2017 -0700"
      },
      "committer": {
        "name": "Donald Chai",
        "email": "dchai@google.com",
        "time": "Thu Oct 12 21:34:22 2017 -0700"
      },
      "message": "AAPT: treat \"-I\" with lower precedence than main APK for dumping.\n\nThis is the desired behavior if resource IDs may overlap, and also happens to\nimprove the behavior of:\n\n  aapt dump -I base.apk badging feature.apk\n\nwhen both APKs use the same package name with different package IDs\n(base\u003d0x7F, feature\u003d0x80).  Previously, the final call to\nDynamicRefTable::addMapping was for base.apk, and all references to 0x80 were\nrewritten in DynamicRefTable::lookupResourceId to 0x7F.  After this\nchange resources defined in both APKs are resolved correctly.\n\nNote that this is a bit of kludge, and APKs should use different names\nto avoid conflating the package IDs.\n\nFixes: 67070085\nBug: 64058531\nTest: manual with sample in b/67070085#comment2\nChange-Id: I285adb6f44a297440b08fc7a1f9ad73c700eb9bc\n"
    },
    {
      "commit": "08e76846b680316b1cf09dd156726e7b5d27e7ed",
      "tree": "87cceba30de911d0f732b8ff5c0cb290f252553d",
      "parents": [
        "84820ec7b319db7920930f864fc6f6553e3c804d",
        "61879522fe1ee10e4d09ffb530dff17d5b4fef65"
      ],
      "author": {
        "name": "Yunlian Jiang",
        "email": "yunlian@google.com",
        "time": "Tue Oct 03 04:44:37 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Oct 03 04:44:37 2017 +0000"
      },
      "message": "Merge \"Replace strcpy with memcpy.\" am: bb115bac41 am: 16951dcb54 am: 23f6dca5fd\nam: 61879522fe\n\nChange-Id: Iaf1e0edbb3902714621492d6dd53458c1ad50b01\n"
    },
    {
      "commit": "61879522fe1ee10e4d09ffb530dff17d5b4fef65",
      "tree": "e87da0ce483f25242f80b3281105b407b5938055",
      "parents": [
        "c153d7a23be0e196e9f48d25b6169ad6b1196374",
        "23f6dca5fda7e53f3ab08a630ce7c62d06127ac1"
      ],
      "author": {
        "name": "Yunlian Jiang",
        "email": "yunlian@google.com",
        "time": "Tue Oct 03 04:38:07 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Oct 03 04:38:07 2017 +0000"
      },
      "message": "Merge \"Replace strcpy with memcpy.\" am: bb115bac41 am: 16951dcb54\nam: 23f6dca5fd\n\nChange-Id: I446973c3b96f253e3c3fc2dfda7647cd3e625916\n"
    },
    {
      "commit": "bb115bac418107c0b2e90514ed525a4f9217695b",
      "tree": "a0ef5f7bbaa8c225bb704cc530ef0a427e1fd868",
      "parents": [
        "1704df64ceaa282c8f91f886204261af1f4395a2",
        "d32ae10f4cdcff2351c9f34ce477089111093d32"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Tue Oct 03 04:09:48 2017 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Tue Oct 03 04:09:48 2017 +0000"
      },
      "message": "Merge \"Replace strcpy with memcpy.\""
    },
    {
      "commit": "d32ae10f4cdcff2351c9f34ce477089111093d32",
      "tree": "5e21a2fdab6f1d10e8e7dd8c5cc60248b8bce471",
      "parents": [
        "2cdd1ce6001e642f65456f6504cbb7d11cd1469d"
      ],
      "author": {
        "name": "Yunlian Jiang",
        "email": "yunlian@google.com",
        "time": "Wed Sep 13 12:01:15 2017 -0700"
      },
      "committer": {
        "name": "Yunlian Jiang",
        "email": "yunlian@google.com",
        "time": "Tue Sep 26 16:02:11 2017 -0700"
      },
      "message": "Replace strcpy with memcpy.\n\nThis fixes the warning\nCall to function \u0027strcpy\u0027 is insecure as it does not provide bounding of\nthe memory buffer. As a side effect, it sliences the warning\nframeworks/base/tools/aapt/Images.cpp:1270:50: warning: Potential leak\nof memory pointed to by field \u0027data\u0027 [clang-analyzer-unix.Malloc]\nframeworks/base/tools/aapt2/compile/Png.cpp:562:42: warning: Potential\nleak of memory pointed to by field \u0027data\u0027 [clang-analyzer-unix.Malloc].\n\nBug: None\nTest: The warning is gone.\n\nChange-Id: I25f68ff85bea7069c21549c7deb7920d1877069e\n"
    },
    {
      "commit": "e33de76a16f6acc42858766460976f44e629657d",
      "tree": "ce962def3f718730407e6863a14aaf0df9a66787",
      "parents": [
        "d2d6c257f141ed38da2cf0d0a2f84c6f7f055e92",
        "e02983681ae85212c2263055fd4bcfd8097f19bc"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Fri Sep 15 16:57:21 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Sep 15 16:57:21 2017 +0000"
      },
      "message": "Merge changes Id8bdb14e,I573a6735,Ia804777f,Ia68122cb,Ia1997800, ... into oc-mr1-dev\nam: e02983681a\n\nChange-Id: I42369e6fb7bd121e45b5a002cd5f00e05221ead3\n"
    },
    {
      "commit": "40e869e2a5207281653be40d030e92c3b664ee31",
      "tree": "e2e09a84d3432174f5a24db478ca19a0774e1ac5",
      "parents": [
        "f1a7e04851ecbb707e7e18eace31b5eaf95bcc48"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Fri Aug 25 17:29:47 2017 -0700"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Thu Sep 14 11:31:40 2017 -0700"
      },
      "message": "AAPT: Dump badging should pickup strings from the right package\n\nA bug in the dump badging command caused strings to be looked up in the\nfirst loaded package only.\n\nBug: 64948230\nBug: 65645766\nTest: none\nChange-Id: Ia804777fe3f963004a5c053129ef6e0c94b7f6a3\nMerged-In: Ia804777fe3f963004a5c053129ef6e0c94b7f6a3\n"
    },
    {
      "commit": "116abe23c4cbef3556f3fac756eb76d64fda365d",
      "tree": "1302e4cbae8bfef1f153ec1e517ac07587e526d1",
      "parents": [
        "72de72c1194a86cc72eb73dd662e43a1f72e10f4",
        "2e9ec5f0de4c69cd97640ae9de38da84f9352f21"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Sun Sep 10 02:15:34 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sun Sep 10 02:15:34 2017 +0000"
      },
      "message": "Merge changes I93cf24d4,I32e438ef am: 30798ad13a am: c28d591b36 am: 59225490b8\nam: 2e9ec5f0de\n\nChange-Id: Ie590c34bce9d0218bb9b48294756dae04e9210b7\n"
    },
    {
      "commit": "2e9ec5f0de4c69cd97640ae9de38da84f9352f21",
      "tree": "26c20cbe9f92844358e382c040e5c00edfd23f8e",
      "parents": [
        "ac2e9ba5308500fc358b270a4fa5e9178ab4db7e",
        "59225490b858294a737bbe62aed4850543bf4b10"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Sun Sep 10 02:05:05 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sun Sep 10 02:05:05 2017 +0000"
      },
      "message": "Merge changes I93cf24d4,I32e438ef am: 30798ad13a am: c28d591b36\nam: 59225490b8\n\nChange-Id: I6cf57e951900b3df816070feee0d3bf92a6a5a7d\n"
    },
    {
      "commit": "848755812040389041fdaee5f75be6348c79a6a1",
      "tree": "7cb7f2be6af29f141114649ab9c1ffa3e8b86088",
      "parents": [
        "c80623a641c5b633b077bea2d7f2e2aeae7bf020",
        "eb211c23d572422e80e5e1159c28d7bed2283da2"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Sat Sep 09 20:03:39 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sat Sep 09 20:03:39 2017 +0000"
      },
      "message": "Merge changes Ia3bcece1,Icd26dc1e am: ec462238f6 am: c201a6bb7d am: 9539d236e7\nam: eb211c23d5\n\nChange-Id: I0b4d324af3a1d7dad4648a9d0ffe0d8c44bee6a9\n"
    },
    {
      "commit": "eb211c23d572422e80e5e1159c28d7bed2283da2",
      "tree": "876d5f0b19f09a044476b606614c826223126136",
      "parents": [
        "f1ae466af8988d82e884dfcf126a1a8a24f36ffe",
        "9539d236e73326888f921cce301923d6d0bbde85"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Sat Sep 09 19:54:02 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Sat Sep 09 19:54:02 2017 +0000"
      },
      "message": "Merge changes Ia3bcece1,Icd26dc1e am: ec462238f6 am: c201a6bb7d\nam: 9539d236e7\n\nChange-Id: I2a5c73a54004c1aa378d25776de0d2080544137d\n"
    },
    {
      "commit": "d3eac266b02399a8a822517e844c05585879221a",
      "tree": "9d6cefd142dd515c9e3ad946f6549f9727822c8e",
      "parents": [
        "1cb5ab2dc14fb35359525479a7c7356d84904ce1"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Fri Sep 08 22:47:47 2017 -0700"
      },
      "committer": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Sat Sep 09 06:18:48 2017 +0000"
      },
      "message": "Convert host tools to Android.bp\n\nSee build/soong/README.md for more information.\n\nTest: m libinstrumentation interrupter accessorychat accessorytest bit obbtool pbkdf2gen libsplit-select_tests split-select protoc-gen-javastream validatekeymaps libaapt_tests aapt\nTest: mmma frameworks/base\nTest: out/host/linux-x86/nativetest64/libaapt_tests/libaapt_tests\nTest: out/host/linux-x86/nativetest64/libsplit-select_tests/libsplit-select_tests\nChange-Id: I93cf24d4b232353a52d53be8ed85781b8f4a3877\n"
    },
    {
      "commit": "896f01879b424e4f37e65bcf546dc9d5cd712e25",
      "tree": "bee72eace47c2e531c02645bd197a0705c39a243",
      "parents": [
        "85aee73e98118e68c13c17dbef26b3b73dcaec40"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Fri Sep 08 22:02:41 2017 -0700"
      },
      "committer": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Fri Sep 08 22:58:56 2017 -0700"
      },
      "message": "Don\u0027t compile libaapt with the build number\n\nOnly do that for the aapt binary itself. This will allow libaapt to be\nconverted to Soong.\n\nAlso remove a few lines that weren\u0027t doing anything: aaptCppflags was\nnever set, LOCAL_C_INCLUDES :\u003d $(LOCAL_PATH) is implied.\n\nTest: m aapt\nTest: aapt version\nChange-Id: Ia3bcece14921417e1bfd3406630961c013bd497c\n"
    },
    {
      "commit": "85aee73e98118e68c13c17dbef26b3b73dcaec40",
      "tree": "36d10684cd2afa0a7284b8f59c4d548f2b64e8bb",
      "parents": [
        "8157ab2a0e1ae9d84debe7ad3ef8d889a4a203b4"
      ],
      "author": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Fri Sep 08 21:26:31 2017 -0700"
      },
      "committer": {
        "name": "Dan Willemsen",
        "email": "dwillemsen@google.com",
        "time": "Fri Sep 08 22:44:19 2017 -0700"
      },
      "message": "aapt: Always use our libz\n\nInstead of using the system libz (-lz), include our copy as a static\nlibrary. This is safer in case the system version isn\u0027t compatible.\n\nAlso removes references to -ldl -lrt -lpthread, which are now implied.\n\nTest: m -j\nTest: out/host/linux-x86/nativetest64/libaapt_tests/libaapt_tests\nTest: out/host/linux-x86/nativetest64/aapt2_tests/aapt2_tests\nTest: out/host/linux-x86/nativetest64/libsplit-select_tests/libsplit-select_tests\nChange-Id: Icd26dc1e0d011e5b5f158e562640533c5ac34e33\n"
    },
    {
      "commit": "7bd7a62336b013467d06f23290663fc3b4d1e37a",
      "tree": "af9ec5b695e6445eacaaa798cbf9b8b1d75d44fd",
      "parents": [
        "25706748aa867a9bd29fd2882c14e95167252517"
      ],
      "author": {
        "name": "Makoto Onuki",
        "email": "omakoto@google.com",
        "time": "Thu Aug 31 08:35:59 2017 -0700"
      },
      "committer": {
        "name": "Michael Wright",
        "email": "michaelwr@google.com",
        "time": "Thu Aug 31 18:06:26 2017 +0000"
      },
      "message": "Add VERSION_CODES.P\n\nBug: 64982450\nTest: Build and boot\nChange-Id: I0a90033239081c583b10021cbc06d032e206beb4\n"
    },
    {
      "commit": "d1ae6e2bf48475bda0356707c978bb2f9d473e88",
      "tree": "68d40c0bb0f2d0a8efe94d879d92c0d7b0f94ec7",
      "parents": [
        "305e97ac5c5dc4d5149db9d70c466c0c29ccf19e",
        "3b8e9e24681aac2bff88f4958031d2500fcd8eb6"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed Aug 30 17:02:38 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Aug 30 17:02:38 2017 +0000"
      },
      "message": "Merge \"AAPT: Dump badging should pickup strings from the right package\""
    },
    {
      "commit": "3b8e9e24681aac2bff88f4958031d2500fcd8eb6",
      "tree": "c7096d82f7102e6334bd392dbc51dbbf363d39ad",
      "parents": [
        "d48474969e786eaf911ac51bcd05faa3399b788a"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Fri Aug 25 17:29:47 2017 -0700"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Fri Aug 25 17:29:47 2017 -0700"
      },
      "message": "AAPT: Dump badging should pickup strings from the right package\n\nA bug in the dump badging command caused strings to be looked up in the\nfirst loaded package only.\n\nBug: 64948230\nTest: none\nChange-Id: Ia804777fe3f963004a5c053129ef6e0c94b7f6a3\n"
    },
    {
      "commit": "eec01ac5a3dec5030edc5c81ae215bcd10183c5b",
      "tree": "413c597adbbe6e7a7cb47d07c27879aa1d665303",
      "parents": [
        "f144f6ecd9386eba9cb516bec42c07295e3f9765"
      ],
      "author": {
        "name": "Michael Wright",
        "email": "michaelwr@google.com",
        "time": "Wed Aug 23 13:49:14 2017 -0700"
      },
      "committer": {
        "name": "Michael Wright",
        "email": "michaelwr@google.com",
        "time": "Wed Aug 23 13:49:14 2017 -0700"
      },
      "message": "O MR1 is API 27\n\nBug: 64982450\nTest: manual\nChange-Id: I4be170f9f1021899db3ef0bce3eaeada21f8b475\n"
    },
    {
      "commit": "7beabc264b371be485b136319d54e3cfac75dc41",
      "tree": "29ae2658f732033538f1a1ec2ec86749d5dff599",
      "parents": [
        "1d47c55407f539d7d57ed16bd088de0a79a6ad82"
      ],
      "author": {
        "name": "Jeff Sharkey",
        "email": "jsharkey@android.com",
        "time": "Wed Jul 19 13:57:35 2017 -0600"
      },
      "committer": {
        "name": "Jeff Sharkey",
        "email": "jsharkey@google.com",
        "time": "Thu Jul 20 03:19:33 2017 +0000"
      },
      "message": "Let\u0027s get a constant for O_MR1.\n\nTest: none\nExempt-From-Owner-Approval: HULK SMASH!\nChange-Id: I440ebae4d0891d9044bbbfb5beaaaa98639aea98\n"
    },
    {
      "commit": "4fb6516a55604bfbae2e8b1411e1bdd27df1866f",
      "tree": "674a09589c4a845ca4bea340335e8eb683a3ee65",
      "parents": [
        "f02beb06daf49a2113881484579a36249f5a19a1"
      ],
      "author": {
        "name": "Igor Viarheichyk",
        "email": "viarheichyk@google.com",
        "time": "Thu Jul 06 15:23:51 2017 -0700"
      },
      "committer": {
        "name": "Igor Viarheichyk",
        "email": "viarheichyk@google.com",
        "time": "Thu Jul 06 15:41:47 2017 -0700"
      },
      "message": "Improved word break for BiDi pseudolocalizer.\n\nCharacted sequences \\n and \\t are now treated as word separators\nby BiDi pseudolocalizer. This solves issues when text rendering\nengine breaks a line in the middle of a text chunk marked with\nRLM+RLO and PDF+RLM sequences.\n\nBug:34064580\nChange-Id: I52e6018785fae25479fa167440f24c534b0e3253\nFixes:34064580\nTest: make aapt2_tests\nTest: Run aapt2_tests binary\n"
    },
    {
      "commit": "57fe48389f845709db23234088b97f4e30307ff4",
      "tree": "0ae774b1defd42793ae936a8e25eeb12064a6ee5",
      "parents": [
        "f93dc8b6504200d0b6d502d924a70a743f9b1411"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Wed May 10 15:42:22 2017 -0700"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Wed May 10 15:42:22 2017 -0700"
      },
      "message": "AAPT: Allow including dependencies in dump command\n\nFeature splits depend on their base. The dump badging command\ndoes resource resolution, and needs to be able to find resources\nlocated in the base APK of a feature split.\n\nBug: 38038608\nTest: manual\nChange-Id: I8c22f0083c46a853a3a56a4049715409ac2723fe\n"
    },
    {
      "commit": "7844a34308bf9797defcf80bce93fa1d7a7a3de0",
      "tree": "16987beb53324dc54313a224e417397d73c0c17a",
      "parents": [
        "d5dfde890c611badbaec547ef127c07487d90038",
        "54b58ba5cc2c341b39355e265f760fe0654f77a7"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed Apr 19 20:54:06 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Apr 19 20:54:10 2017 +0000"
      },
      "message": "Merge \"Fix issue with unresolved IDs in adaptive icons\" into oc-dev"
    },
    {
      "commit": "54b58ba5cc2c341b39355e265f760fe0654f77a7",
      "tree": "592d2e3026cd67b3a495e93122ed9d85350b3505",
      "parents": [
        "1e28c8fa337388060dc7f69a835852cab324724d"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Fri Apr 14 18:44:30 2017 -0700"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Tue Apr 18 18:05:02 2017 -0700"
      },
      "message": "Fix issue with unresolved IDs in adaptive icons\n\nAdaptive icons were versioned correctly, but skipped the compilation\n/ resource ID assignment phase. This CL fixes the glitch.\n\nBug: 34829129\nTest: manual\nChange-Id: I93739a8b10fac53a048d95b330edf381684a807c\n"
    },
    {
      "commit": "99d36ee8a936d5f9d95305183241ed597bace8e8",
      "tree": "62e4d0459ff1ec55fb197165041892c87ecb9149",
      "parents": [
        "ec8f35366851fcfea2d8b8e42821dda72bdca344"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Mon Apr 17 16:22:03 2017 -0700"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Mon Apr 17 16:22:03 2017 -0700"
      },
      "message": "AAPT: Auto-alias application adaptive-icon\n\nWhen a developer specifies an adaptive application icon,\nand a non-adaptive round application icon, create an alias\nfrom the round icon to the regular icon for v26 APIs and up.\n\nWe do this because certain devices prefer android:roundIcon over\nandroid:icon regardless of the API levels of the drawables set for\neither.\n\nThis auto-aliasing behaviour allows an app to prefer the\nandroid:roundIcon on API 25 devices, and prefer the adaptive icon on\nAPI 26 devices.\n\nAn app developer can override this behaviour by explicitly setting the\nandroid:roundIcon to a drawable that has a v26 qualifier.\n\nBug: 34829129\nTest: manual\nChange-Id: Iaaaa5d8367e4f3f9e9f2e3b51c782d3be6a3bb71\n"
    },
    {
      "commit": "cf1f1d9128853f0fa0cef657e2bbb7bf6904c732",
      "tree": "68e76fbe66623c18408fccb2c8c190cc0a760f49",
      "parents": [
        "3ab5c0173a7371c1757c52029cde5f4f84d3bd22"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Thu Mar 16 16:54:23 2017 -0700"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Tue Mar 28 19:16:11 2017 +0000"
      },
      "message": "AAPT: Version \u003cadaptive-icon\u003e to v26\n\nBug: 35908647\nTest: manual\nChange-Id: Ic8f43efe34385192fbab18675eb5898ed80912a5\n"
    },
    {
      "commit": "205548561c67a3c05163d17057a1fc76a338ec15",
      "tree": "fa402bbcbbb23c34915601cc1cb19b49eb7cd8a6",
      "parents": [
        "5beefa697aeca3eeaeeac50f781908657490e211"
      ],
      "author": {
        "name": "ztenghui",
        "email": "ztenghui@google.com",
        "time": "Tue Mar 21 16:28:57 2017 -0700"
      },
      "committer": {
        "name": "ztenghui",
        "email": "ztenghui@google.com",
        "time": "Tue Mar 21 16:44:00 2017 -0700"
      },
      "message": "disable versioning for objectAnimator to support path motion\n\nbug:33527757\n\nTest: replace the AAPT in local SDK, and make sure the propertyX/YName\nstill works within ObjectAnimator.\n\nChange-Id: Ic9bb14cd228dcf7e4d250bd0f6cb5f0c31a14183\n"
    },
    {
      "commit": "2d6fa033e1b2680803d5a9978d0d1d3f8feceb21",
      "tree": "82d5389c7be49bed7a8116a5f4460265669666fd",
      "parents": [
        "208e2644618af7474f399089c264f0da1cfb0c81"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Fri Mar 10 18:42:32 2017 -0800"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Fri Mar 10 18:43:56 2017 -0800"
      },
      "message": "AAPT: Process XML in mipmap directory\n\nMipmap directories should be treated like drawables.\nThey are just a convention that prevents them from\nbeing split or stripped for multi-apk.\n\nBug: 36068314\nTest: manual\nChange-Id: I93ab3871c7d9d403b77989bcc88304e9939866c4\n"
    },
    {
      "commit": "fd7e8971939a519e63dcad8fff58dd7378566270",
      "tree": "ec8e4fa343eb0a1e26ce5db1a9d02b6cb497fddd",
      "parents": [
        "4f459b85d414ef163dd1233af4b1700a5afd4fe7",
        "010df88f90a40f8c521ccde8d6a541e70a044fb7"
      ],
      "author": {
        "name": "Tenghui Zhu",
        "email": "ztenghui@google.com",
        "time": "Wed Mar 08 21:42:43 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Mar 08 21:42:49 2017 +0000"
      },
      "message": "Merge \"Disable versioning for pathInterpolator when no-version-vectors is on.\""
    },
    {
      "commit": "010df88f90a40f8c521ccde8d6a541e70a044fb7",
      "tree": "a99bcbe1134d3c6c20291a4f8bd19b912aade462",
      "parents": [
        "b09ac24c3c7097c85609b430aee1b6fe6e8db321"
      ],
      "author": {
        "name": "ztenghui",
        "email": "ztenghui@google.com",
        "time": "Tue Mar 07 15:50:03 2017 -0800"
      },
      "committer": {
        "name": "ztenghui",
        "email": "ztenghui@google.com",
        "time": "Tue Mar 07 16:12:07 2017 -0800"
      },
      "message": "Disable versioning for pathInterpolator when no-version-vectors is on.\n\nTest: manually build demo app for support lib, and works!\nbug:33527757\n\nChange-Id: I3badea18b2eb8cddea94f7e44f9129bb55ed9649\n"
    },
    {
      "commit": "df7707cb4f34138b423dde493fccfa4e7fb50c20",
      "tree": "b2449ebca18e277ecacd685abb3c75267b8acb74",
      "parents": [
        "8b5ca97a6ccdcd5ee7beb924c5eafd63a310a3cb"
      ],
      "author": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Tue Feb 28 17:43:39 2017 -0800"
      },
      "committer": {
        "name": "Mathias Agopian",
        "email": "mathias@google.com",
        "time": "Fri Mar 03 12:37:54 2017 -0800"
      },
      "message": "fallout of cleaning-up libutils includes\n\nTest: run \u0026 compile\nBug: n/a\nChange-Id: I0f6a0be03f4b120b1b5876aae0c0618c025d9f2b"
    },
    {
      "commit": "cd154e95353e7af11314d2339500d6c7f85e181a",
      "tree": "4e04c20b2ff5fde52da63511ba1a68a96ab6835b",
      "parents": [
        "eb422ead0cd7101855db4bff50cb71321cee2377"
      ],
      "author": {
        "name": "Dianne Hackborn",
        "email": "hackbod@google.com",
        "time": "Tue Feb 28 17:37:35 2017 -0800"
      },
      "committer": {
        "name": "Dianne Hackborn",
        "email": "hackbod@google.com",
        "time": "Wed Mar 01 12:40:57 2017 -0800"
      },
      "message": "Implement issue #34842682: Add ability to limit permissions based on features\n\nTwo new attributes for \u003cuses-permission\u003e: android:requiredFeature and\nandroid:requiredNotFeature.\n\nAlso update aapt to include this information in badging:\n\nuses-permission: name\u003d\u0027android.content.cts.REQUIRED_NOT_FEATURE_UNDEFINED\u0027 requiredNotFeature\u003d\u0027android.software.cts.undefined\u0027\nuses-permission: name\u003d\u0027android.content.cts.REQUIRED_MULTI_DENY\u0027 requiredFeature\u003d\u0027android.software.cts.undefined\u0027 requiredNotFeature\u003d\u0027android.software.cts\u0027\n\nTest: new PermissionFeatureTest suite.\n\nChange-Id: Icc1f815a4675ae9dd2cb7f61730ab28b5c11228a\n"
    },
    {
      "commit": "75e7d1d73e74cdc85a5fb731fa13159ab073d939",
      "tree": "7193961bcf4abecd118479b3fae730436fd42aac",
      "parents": [
        "ed71756327a57a301ea7a2b6d6041517320ab3ad"
      ],
      "author": {
        "name": "Aurimas Liutikas",
        "email": "aurimas@google.com",
        "time": "Fri Feb 17 12:06:41 2017 -0800"
      },
      "committer": {
        "name": "Aurimas Liutikas",
        "email": "aurimas@google.com",
        "time": "Fri Feb 17 18:44:28 2017 -0800"
      },
      "message": "Removes an already defined warning in aapt.\n\nApps that expect to use the current SDK don\u0027t specify anything in their\nmanifest and the build system rightfully injects the current SDK.\n\nAny apps that specify their own \u003cuses-sdk\u003e or versionCode are telling\nthe build system that they are purposely using some other minSdkVersion,\netc (support library demos).\n\nTest: None\nChange-Id: I0aba3a71e15703c7bcafcf4d35608a1851dd8567\nFixes: 34901699\n"
    },
    {
      "commit": "af463961bc44c53fe35fe184a93b55d07273a676",
      "tree": "2532e5693888c4e59f2d501650b2af7277ed27e1",
      "parents": [
        "0ebe2d1b0dca82cadbce2fad5eff32c7d498d1f6",
        "fa1e9d7ad0e3f5b7fce37dbdc3f5ad889274ee43"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Wed Feb 08 14:07:19 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Feb 08 14:07:22 2017 +0000"
      },
      "message": "Merge \"AAPT: Fix --feature-of to allow non-public symbol visibility\""
    },
    {
      "commit": "d9861d9715d90e94865a6967f9402aa4c8717b7d",
      "tree": "ea06129612a9e67def9c2f72711e9c92b4ffae40",
      "parents": [
        "482ebe9bad56deaee3a2ccc36f05a261cfa5bec4",
        "9bbe787822502e8c09d9abe963e6539647bea346"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed Jan 25 03:28:22 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Jan 25 03:28:26 2017 +0000"
      },
      "message": "Merge \"Finish font support for AAPT\""
    },
    {
      "commit": "e84ad491c82168228f042644285a2581fc619baf",
      "tree": "4c14b28f519d939da23578fc7b4935cfb5b1adb6",
      "parents": [
        "b7cab6a19096458a7fafa905eed52db83759b6c6",
        "4832745b84d6a358582f2264d22acacf25e01b07"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed Jan 25 01:20:23 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Jan 25 01:20:28 2017 +0000"
      },
      "message": "Merge \"Add color mode to activity/window\""
    },
    {
      "commit": "fa1e9d7ad0e3f5b7fce37dbdc3f5ad889274ee43",
      "tree": "9534bed2e842071ede73c74d096829f5f751c3bb",
      "parents": [
        "9bbe787822502e8c09d9abe963e6539647bea346"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Tue Jan 24 16:16:09 2017 -0800"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Tue Jan 24 16:16:09 2017 -0800"
      },
      "message": "AAPT: Fix --feature-of to allow non-public symbol visibility\n\nTest: manual\nChange-Id: Iada18b201c6463011002f96285a64c64565a6e1c\n"
    },
    {
      "commit": "4832745b84d6a358582f2264d22acacf25e01b07",
      "tree": "cde7e923e06892dfa7c9b1a10a10e8da91e007f1",
      "parents": [
        "a393ff7dc7e7e7002a400d37868e0d6c14507b43"
      ],
      "author": {
        "name": "Romain Guy",
        "email": "romainguy@google.com",
        "time": "Mon Jan 23 17:03:35 2017 -0800"
      },
      "committer": {
        "name": "Romain Guy",
        "email": "romainguy@google.com",
        "time": "Tue Jan 24 15:55:09 2017 -0800"
      },
      "message": "Add color mode to activity/window\n\nThe color mode lets an application request a wide color gamut for\na specific window. This will also be used in the future to request\nHDR. The color mode is currently either default (sRGB) or an undefined\nwide gamut color space chosen by the platform. These attributes could\nlater be used to choose a specific color space if we deem this important\nor useful.\n\nThis change also renames the various \"colorimetry\" attributes and\nconstants to \"color mode\" for consistency. These symbols were\nadded in O and can be safely renamed.\n\nTest: CtsColorModeTestCases\nBug: 32984164\nChange-Id: I4d4691dd12dbe3f3aa6a5cf893cff39aa16c739e\n"
    },
    {
      "commit": "9bbe787822502e8c09d9abe963e6539647bea346",
      "tree": "e8490849a1ba6013ed2cd2a7a4d37cdbd06a0b4f",
      "parents": [
        "04620c98a7470109700e93caaa84b44ff23dfb5e"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Tue Jan 24 13:52:04 2017 -0800"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Tue Jan 24 13:52:45 2017 -0800"
      },
      "message": "Finish font support for AAPT\n\nTest: make CtsContentTestCases in cts/tests/tests/content\nChange-Id: Ie1e08deeef56611de261bd12f25f53c88068950e\n"
    },
    {
      "commit": "4d35cca96ce55eb29d1948086214f91ae94e9adb",
      "tree": "2ddb5bd63163bf8806be9dc4773e66630b5c4712",
      "parents": [
        "9727f22fc092fe7ccdbf2929d697126f2095d62e"
      ],
      "author": {
        "name": "Yuichi Araki",
        "email": "yaraki@google.com",
        "time": "Wed Jan 18 20:42:17 2017 +0900"
      },
      "committer": {
        "name": "Yuichi Araki",
        "email": "yaraki@google.com",
        "time": "Tue Jan 24 14:59:51 2017 +0900"
      },
      "message": "AAPT: Add --no-version-transitions flag\n\nAdd a new flag to disable versioning of Transition related XMLs.\nTransition support library will use this to handle these XMLs on older\nAPI levels.\n\nTest: make libaapt_tests AaptTestAppOne\nBug: 34427868\nChange-Id: I66e81cca049e71ef6704177b2ca21c9cdeaff78f\n"
    },
    {
      "commit": "b334b8f0f26d93e50c07bbb90ade097025d795c1",
      "tree": "8387129dfa68c1d600ced29493a07d63a2888252",
      "parents": [
        "2317b64f02500377c10ade0bda68cfeb69fda32a",
        "83b4f7daba75e73ca9aad6033ed513902dc3b5bb"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Mon Jan 23 11:48:08 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Mon Jan 23 11:48:12 2017 +0000"
      },
      "message": "Merge \"AAPT: Add support for \u0027font\u0027 resource type\""
    },
    {
      "commit": "83b4f7daba75e73ca9aad6033ed513902dc3b5bb",
      "tree": "4090a3c3fc497aeb26197cca1fbcc9807197e640",
      "parents": [
        "1f9f11007db09bbbc156965e77b10de82a32a544"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Fri Jan 20 13:19:27 2017 -0800"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Fri Jan 20 13:19:27 2017 -0800"
      },
      "message": "AAPT: Add support for \u0027font\u0027 resource type\n\nChange-Id: I5bc459e34715779ab3b1c415f40f592a4ccbb96e\nTest: manual\n"
    },
    {
      "commit": "c9ba55902123be5abcf2dcda5af9995be0b8d3d8",
      "tree": "953bf264c1f748816ad8ebc4898f580d163ce959",
      "parents": [
        "a2b1774d758b58fc5977f631eff76fa21d303906"
      ],
      "author": {
        "name": "Romain Guy",
        "email": "romainguy@google.com",
        "time": "Wed Jan 18 16:34:42 2017 -0800"
      },
      "committer": {
        "name": "Romain Guy",
        "email": "romainguy@google.com",
        "time": "Thu Jan 19 18:44:00 2017 -0800"
      },
      "message": "Add wide color gamut and HDR resource qualifiers\n\nBug: 32984164\nTest: Config_test, AaptConfig_test and aapt2_tests\nChange-Id: Ie9c82bfe2d36b1d6180ee223250ab5bb2ce90dd4\n"
    },
    {
      "commit": "1a6acdbb86c3e72bdb0a4dcab3bda58cbc4ea34c",
      "tree": "1b243f434a14a25dc0eb39097293c3f27b74a54a",
      "parents": [
        "3c6f28aa5968b1edb823495efa15e7358de5261e"
      ],
      "author": {
        "name": "Zak Cohen",
        "email": "zakcohen@google.com",
        "time": "Mon Dec 12 15:21:21 2016 -0800"
      },
      "committer": {
        "name": "Zak Cohen",
        "email": "zakcohen@google.com",
        "time": "Wed Jan 11 11:44:47 2017 -0800"
      },
      "message": "Introduce new UI_MODE_TYPE_VR_HEADSET and qualifier.\n\nBug: 30989383\nTest: Unit test for aapt2\nChange-Id: I66dc65af6327b94fed74538bee08cada0b8be4fa\n"
    },
    {
      "commit": "2386df23ac9e932a385b9c2fbddbf9e445eaada0",
      "tree": "732478e94226133cffcccd921a9d7f6ced16729c",
      "parents": [
        "280cdfcbc0755ba5eb233a9162d0ccf92d45b761"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Wed Dec 28 15:08:58 2016 -0500"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Wed Dec 28 16:07:24 2016 -0500"
      },
      "message": "AAPT: Dump maxSdkVersion for implicit permissions\n\nBug: 32599997\nTest: Manual\nChange-Id: I13bdcf097625e3cb5fb35da1eb2544b0f8906e79\n"
    },
    {
      "commit": "fcb5f7bf36cb77a359fd3fb01af7bf0140da16be",
      "tree": "4afefb025e0bb714bc04c93ce2f0723b91a0e7db",
      "parents": [
        "71a7b9ad7cd6286e2f4cd4141344a17fa9d3038d"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Wed Nov 02 13:17:10 2016 -0700"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Wed Nov 02 13:17:10 2016 -0700"
      },
      "message": "AAPT: fix error message\n\nTest: none\nBug:9779154\nChange-Id: Iebda7d4f0061cdc51db0103977195964fcc1211d\n"
    },
    {
      "commit": "21c2e9e60c9e66e848fc9276b878c1ab1bd66aa9",
      "tree": "be6eef39574167ff885bf6f71e8a41de88ea3e24",
      "parents": [
        "4ede0e9b59681dc2a970898171b662b5db9c674f",
        "6e60ab12e709d6e72659c823540e8591cc2412de"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Mon Oct 17 21:38:33 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Oct 17 21:38:33 2016 +0000"
      },
      "message": "Merge \"missing includes\" am: 78929f3ee0 am: 6a8f0d70b0\nam: 6e60ab12e7\n\nChange-Id: I1b5c6f49d2ae565ebd59c6ce8d590512ab306487\n"
    },
    {
      "commit": "6a8f0d70b09d3e628f2b3472b1c534dd213be3ec",
      "tree": "131a3b13c17555fef4145f22323a8d5762d6f160",
      "parents": [
        "95319337979b2c6fe81c17d6a14c2704bcaa5a0d",
        "78929f3ee0b9420fc282f1fe0db69c87a629751c"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Mon Oct 17 21:25:59 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Oct 17 21:25:59 2016 +0000"
      },
      "message": "Merge \"missing includes\"\nam: 78929f3ee0\n\nChange-Id: I3e7a25ded484d516fab453abe434c2e53cf0f27e\n"
    },
    {
      "commit": "4d6c372eaebc6d227f7222a92950a64c76fd4baf",
      "tree": "c119ce520a4cdf5870380544f202ab6ba56d6625",
      "parents": [
        "9a904d68c75ceae85086b03493f4bc7f23a3acd3"
      ],
      "author": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Mon Oct 17 10:10:55 2016 -0700"
      },
      "committer": {
        "name": "Mark Salyzyn",
        "email": "salyzyn@google.com",
        "time": "Mon Oct 17 12:32:54 2016 -0700"
      },
      "message": "missing includes\n\nAssumptions are made about header side effects\n\nTest: compile\nBug: 30465923\nChange-Id: Icc9415aed5e54b2bc00b70aa0da6df4148f30654\n"
    },
    {
      "commit": "8607c7016fed0581545d6de03d39b12b20c6d9d9",
      "tree": "92757f3ecdf4e453cb89a105f1970423413de05e",
      "parents": [
        "be15b9643b868e4926dc2ff0bcd354ea168b3001",
        "a40eeb09795755c05ccbc53fe480722f2ea7cd38"
      ],
      "author": {
        "name": "George Burgess IV",
        "email": "gbiv@google.com",
        "time": "Fri Oct 14 20:07:51 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Oct 14 20:07:51 2016 +0000"
      },
      "message": "Merge \"Fix static-analyzer warning.\" am: 2fbf30d3fe am: a52992e290 am: c88628da5e\nam: a40eeb0979\n\nChange-Id: I973bb3f7f72f38133472874727b4297042ee0a50\n"
    },
    {
      "commit": "a40eeb09795755c05ccbc53fe480722f2ea7cd38",
      "tree": "8f1720a3add9f78a873cf814aa15be07786c8510",
      "parents": [
        "414c77ce1c8b924330f8cdfa9f1b8cab31155029",
        "c88628da5e74c3d0e044ffcd92d74f622a21aeee"
      ],
      "author": {
        "name": "George Burgess IV",
        "email": "gbiv@google.com",
        "time": "Fri Oct 14 14:39:06 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Oct 14 14:39:06 2016 +0000"
      },
      "message": "Merge \"Fix static-analyzer warning.\" am: 2fbf30d3fe am: a52992e290\nam: c88628da5e\n\nChange-Id: Iece80dfbd8a5d01ffdcf6edf1decd8078af31511\n"
    },
    {
      "commit": "0c2774b16a72d13f432cd8b7e8dedd2d6f5ed0ba",
      "tree": "3a1cb092a818d7daa0d93e56569477678c0fc7a1",
      "parents": [
        "c98b34bdce1fb1b43755af7fb8538efb0d0dc953"
      ],
      "author": {
        "name": "George Burgess IV",
        "email": "gbiv@google.com",
        "time": "Tue Oct 11 17:51:10 2016 -0700"
      },
      "committer": {
        "name": "George Burgess IV",
        "email": "gbiv@google.com",
        "time": "Thu Oct 13 15:51:04 2016 -0700"
      },
      "message": "Fix static-analyzer warning.\n\nframeworks/base/tools/aapt/Images.cpp:845:17: warning: Assigned value is\ngarbage or undefined\n     row +\u003d bpp;\n\nBug: None.\nTest: The warning is gone.\nChange-Id: Idf4623d2510111a9188ed39922e109a8db225c76\n"
    },
    {
      "commit": "a77685fa59a327b33e7acbcefe35e63243014cbd",
      "tree": "12fe981ecd8bc19b6dda8bc5177cc0c3aa13be41",
      "parents": [
        "1b219d06e397880e65b7af25a000954a3a39567a"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Mon Oct 03 16:26:28 2016 -0700"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Mon Oct 03 16:33:12 2016 -0700"
      },
      "message": "Remove unused methods from AssetManager.cpp\n\nA lot of the vendor/locale specific code existed pre-1.0\nand was reworked into the current system.\n\nTest: refactoring CL, all code except setLocale() was not being executed.\nTest: setLocale() change tested manually\nChange-Id: Ifb098f9808763a6cf5fb4336e089430adc09e198\n"
    },
    {
      "commit": "f45d261928ec69f4647f005e3cfa74a2aeddb4c2",
      "tree": "57345806ecf89dd8b72e1dae92e87a28a2e0a9c0",
      "parents": [
        "ba8556e53e7cb1a76f1d8ee262427690c23bcf8e",
        "b62cc13c7c427b9381c9c7ffe3dcd95662698108"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Fri Sep 23 01:17:34 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Sep 23 01:17:34 2016 +0000"
      },
      "message": "Merge \"aapt: remove duplicate definition of ZD\" am: ac2d839d7c am: 3efa1e7c17 am: e43f2d4ef5\nam: b62cc13c7c\n\nChange-Id: Ieb593095a6bdc1842b95863fa2cf08ff1fb0669f\n"
    },
    {
      "commit": "ece4c72900ee933e55733701d286a640ddfb03d3",
      "tree": "d84b793b428aa42b6bf70573f09b6c73c1fed6b8",
      "parents": [
        "1c81de0a264ce57280623a1398f993e473449cf3",
        "01496b46d932dc4a264dd0f8f3b494c833648ed7"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Fri Sep 23 01:08:09 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Sep 23 01:08:09 2016 +0000"
      },
      "message": "Merge \"Remove has_trivial_move trait from StringPool types\" am: d333f28397 am: 6f02f57f12 am: 57ef0a40f1\nam: 01496b46d9\n\nChange-Id: Icdbc696e08f06986b699681d858a10953402ca7a\n"
    },
    {
      "commit": "b62cc13c7c427b9381c9c7ffe3dcd95662698108",
      "tree": "3312d2d2ecbbc1fabe709c794ec83258d0633b6b",
      "parents": [
        "c1f00b916fd4a04ebcdfc86b243dddfecbacb878",
        "e43f2d4ef5516a0bb87a0f50bf438da8f5619a2a"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Thu Sep 22 23:04:06 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Sep 22 23:04:06 2016 +0000"
      },
      "message": "Merge \"aapt: remove duplicate definition of ZD\" am: ac2d839d7c am: 3efa1e7c17\nam: e43f2d4ef5\n\nChange-Id: I71e7bfd44396aa2a7d79ba983bcc71d7684a36c1\n"
    },
    {
      "commit": "01496b46d932dc4a264dd0f8f3b494c833648ed7",
      "tree": "1b63aa3b45977aac127e383f5283f2945abc9958",
      "parents": [
        "05a9189e34fab2173854e786b2078209bdc1d69d",
        "57ef0a40f10777d6bce0599003a534383a9688d8"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Thu Sep 22 22:58:02 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Sep 22 22:58:02 2016 +0000"
      },
      "message": "Merge \"Remove has_trivial_move trait from StringPool types\" am: d333f28397 am: 6f02f57f12\nam: 57ef0a40f1\n\nChange-Id: If6fab1852e0e9b287a904fe4a4b556167ac0800d\n"
    },
    {
      "commit": "ac2d839d7c8fe58696439b04d3e66382888d22dc",
      "tree": "baa982d56696f366863fa1ffd4ec18a671e38320",
      "parents": [
        "f4c8c3590a82a4f4b56c6ecb7ceb407abdbb83d8",
        "281386df645025b497950c8b4f2e87c6bf570777"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu Sep 22 21:24:46 2016 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Thu Sep 22 21:24:49 2016 +0000"
      },
      "message": "Merge \"aapt: remove duplicate definition of ZD\""
    },
    {
      "commit": "cafc05357c25160f68afc97c5c44dd5b77d0fff8",
      "tree": "d2fb49f5ac75741bdebd70a9d55dbb8cef322165",
      "parents": [
        "59acc059a623268b0eaac54d469a95e09efd81a5"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Thu Sep 22 10:09:38 2016 -0700"
      },
      "committer": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Thu Sep 22 10:09:38 2016 -0700"
      },
      "message": "Remove has_trivial_move trait from StringPool types\n\nStringPool:entry* are not trivially moveable, as they contain Vector\u003c\u003e\nobjects.  The data in Vector\u003c\u003e is trivially moveable, but Vector\u003c\u003e\nitself is a dynamic type with a vtable, which is not trivially\nmoveable.\n\nImpact on aapt for frameworks-res is negligible, ~3%.\n\nBug: 31595853\nTest: m -j framework-res\nChange-Id: I562a46ef8934aed7aab5c5377db53d9cf64a08b9\n"
    },
    {
      "commit": "fd2cfb17e84b0ba1697dba8f6c1c9410669725df",
      "tree": "b2b0a47c4ea6921ac40217c46b15d475a008a531",
      "parents": [
        "35fc17ee7dcb61aa7ea355b8179ea6484a319c9f",
        "5c60cb9208a9a8d2f6b05d341800097643615401"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Thu Sep 22 06:52:45 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Sep 22 06:52:45 2016 +0000"
      },
      "message": "AAPT: Don\u0027t imply specific location hardware for dump badging am: 43158773b4 am: 7f56759cfd\nam: 5c60cb9208\n\nChange-Id: I7251036c3212a576fb68023d05687d0e10a9f6b5\n"
    },
    {
      "commit": "5c60cb9208a9a8d2f6b05d341800097643615401",
      "tree": "9da2c2adb8916ccd34936dae1a9e093cfa2041c2",
      "parents": [
        "627c10bb67d59bb92104c3630b3e40e984e6026d",
        "7f56759cfdff926234c26c14d9a9f69f732179e4"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Thu Sep 22 05:40:44 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Sep 22 05:40:44 2016 +0000"
      },
      "message": "AAPT: Don\u0027t imply specific location hardware for dump badging am: 43158773b4\nam: 7f56759cfd\n\nChange-Id: Id54d729793267634f1ade9073395ed6d6921ce60\n"
    },
    {
      "commit": "43158773b469c2d5b23e52998d0afba9a4b34323",
      "tree": "285707158141317bf3d6d6968cb866d19deeff3d",
      "parents": [
        "d031d57c9e51e45c5723d8b6055c211fb2c06bdd"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Wed Nov 11 15:13:55 2015 -0800"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Wed Sep 21 17:52:58 2016 -0700"
      },
      "message": "AAPT: Don\u0027t imply specific location hardware for dump badging\n\nPermissions such as android.permission.ACCESS_FINE_LOCATION\nand android.permission.ACCESS_COARSE_LOCATION assumed the underlying feature\ntechnology and aapt dump badging would emit an implied feature.\n\nThis is no longer accurate, so the only implied feature is on the general\nandroid.hardware.location when the target SDK of the app is 21+.\n\nBug:25218770\nChange-Id: Ica9ebf7d4f360b137af54a8c8fd6c0358cd9be6a\n"
    },
    {
      "commit": "281386df645025b497950c8b4f2e87c6bf570777",
      "tree": "f85a7254a900e70e6b7315f4cca3d3f8e88fdd48",
      "parents": [
        "9c08f6bb827a7980bf8a8d0f5b9c1d7342e70e86"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Fri Sep 16 12:55:35 2016 -0700"
      },
      "committer": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Fri Sep 16 12:56:21 2016 -0700"
      },
      "message": "aapt: remove duplicate definition of ZD\n\nZD and ZD_TYPE are set by utils/Compat.h, remove them from\nStringPool.cpp and Resource.cpp.\n\nTest: m -j native\nBug: 31492149\nChange-Id: I6154e4598dd1f279e348ef6c0b32d756464bda8a\n"
    },
    {
      "commit": "7fd4eb7ff7ae637d984ed1d75672b018011c598d",
      "tree": "d193e7b5ed0a343775f0193ce321a9d0b328bb45",
      "parents": [
        "5355afde19bfdd4c2dd1c940e12b9e468a4cdcc9",
        "e3cd4b394c6334eb828e5bbc4d69de2896b76678"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Wed Aug 31 00:29:35 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Aug 31 00:29:35 2016 +0000"
      },
      "message": "Merge \"Replace libziparchive-host with libziparchive\" am: 611e205bbe am: 8c8bb25089 am: 63dc310e6a\nam: e3cd4b394c\n\nChange-Id: Icc088a0cdd6a2ebc2b7bedb719ad7220d947273d\n"
    },
    {
      "commit": "e3cd4b394c6334eb828e5bbc4d69de2896b76678",
      "tree": "0acbae0c0f3eb62cc51bd68c37e8ed50f0476a42",
      "parents": [
        "214f2fe7b41406e7ef8a342320e5e1fd3530b1a7",
        "63dc310e6acb5f63c24bd9536e4d173efe90bc04"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Fri Aug 26 20:40:27 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Aug 26 20:40:27 2016 +0000"
      },
      "message": "Merge \"Replace libziparchive-host with libziparchive\" am: 611e205bbe am: 8c8bb25089\nam: 63dc310e6a\n\nChange-Id: I645d077dd656f84446f77fd91c169fd7b977e661\n"
    },
    {
      "commit": "9a1a3bcb164d331480100bd815f3bd89230ff9bc",
      "tree": "d8ef53e61df3c2da9b332c7d145db1d99310ef0d",
      "parents": [
        "0a357a1a7353dc93f6e0c03fbf242231232948d8"
      ],
      "author": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Fri Aug 26 11:15:17 2016 -0700"
      },
      "committer": {
        "name": "Colin Cross",
        "email": "ccross@android.com",
        "time": "Fri Aug 26 11:15:17 2016 -0700"
      },
      "message": "Replace libziparchive-host with libziparchive\n\nlibziparchive-host is no longer necessary, and mixing libziparchive-host\nand libziparchive can cause ODR violations.\n\nChange-Id: I623c0c5579e28f26a6e1db7bd953f33ed1ca68cd\n"
    },
    {
      "commit": "d90d8d615a99ad9f75e2911e98a166b396a89053",
      "tree": "a36708554d2e9010da4601b1930510926bcc2d42",
      "parents": [
        "8f7b8a1f6c5808ea205bfb3294a313e2bcaedf7f"
      ],
      "author": {
        "name": "Sergio Giro",
        "email": "sgiro@google.com",
        "time": "Tue Jun 28 18:26:10 2016 +0100"
      },
      "committer": {
        "name": "Martijn Coenen",
        "email": "maco@google.com",
        "time": "Thu Aug 25 12:19:12 2016 +0200"
      },
      "message": "Add bound checks to utf16_to_utf8\n\nTest: ran libaapt2_tests64\nBug: 29250543\nChange-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3\n(cherry picked from commit 4781057e78f63e0e99af109cebf3b6a78f4bfbb6)\n"
    },
    {
      "commit": "05e31f1837384d483fa4c5ad05673ccb145ddafa",
      "tree": "8bded1e70e4f1a7ff86c912516bb4229fb103e8c",
      "parents": [
        "fdaebc1527c888d6c4a0e546643671e171e32eaa",
        "2c8aa38e7a3934cdbfa34b0e7116bd17bc4ce469"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Wed Aug 17 21:56:34 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed Aug 17 21:56:34 2016 +0000"
      },
      "message": "AAPT: Handle gaps in resources when building splits am: 26ae640c34\nam: 2c8aa38e7a\n\nChange-Id: I475c971fabb2b4bf5acb4f0e9a86d95d79a650ed\n"
    },
    {
      "commit": "26ae640c348eb12e2273887280970cd53675a032",
      "tree": "550cfad11c8b50571e3a435b7bb0e8e515eaed64",
      "parents": [
        "97632afe5ecb0c35366167e3dfd0aa6258ab276f"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Mon Aug 15 18:45:00 2016 -0700"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Wed Aug 17 19:53:01 2016 +0000"
      },
      "message": "AAPT: Handle gaps in resources when building splits\n\nDue to public ID assignment, gaps in resource type and entry\nIDs can occur. This can lead to null pointer dereferencing\nif not careful. This happened in ResourceTable::getDensityVaryingResources()\nwhich is called when building Splits.\n\nBug:30879690\nChange-Id: I588e4dcd2e042fccfcb2e87967b5cbd0d23b4497\n(cherry picked from commit 081d1b4cf602fdd7302b597e6bf902cb415bc3a8)\n"
    },
    {
      "commit": "84ae78b10955bcab04b7e84105f901e1b869d723",
      "tree": "904cd60f0b2e7a86ad020a0ceeec9e196ed23813",
      "parents": [
        "ca9e67a3e7614d5251088b9263c9fb22e78ffa8d",
        "081d1b4cf602fdd7302b597e6bf902cb415bc3a8"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Wed Aug 17 00:03:35 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed Aug 17 00:03:36 2016 +0000"
      },
      "message": "Merge \"AAPT: Handle gaps in resources when building splits\""
    },
    {
      "commit": "081d1b4cf602fdd7302b597e6bf902cb415bc3a8",
      "tree": "731e72ea0c123552ff69c8ffecb0d8a5de9d350b",
      "parents": [
        "2d280471669568d9e14cb7df679a51cf7f4d6c11"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Mon Aug 15 18:45:00 2016 -0700"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Mon Aug 15 18:45:00 2016 -0700"
      },
      "message": "AAPT: Handle gaps in resources when building splits\n\nDue to public ID assignment, gaps in resource type and entry\nIDs can occur. This can lead to null pointer dereferencing\nif not careful. This happened in ResourceTable::getDensityVaryingResources()\nwhich is called when building Splits.\n\nBug:30879690\nChange-Id: I588e4dcd2e042fccfcb2e87967b5cbd0d23b4497\n"
    },
    {
      "commit": "00e7ebbe1ae4ff23d7e3469435cb7f9aabcd7a04",
      "tree": "9964f3b70fcc3606d1acef68ac66e9ce64a0ccad",
      "parents": [
        "da872974970bdad5b9828407c73c6b1d38d784e2",
        "9e8da4a476d1a52d4c287747b5e1b80f61681c15"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Mon Aug 15 23:33:01 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Aug 15 23:33:01 2016 +0000"
      },
      "message": "AAPT: Fix use-after-free error am: 193ed74c2d am: 646f2d9c33\nam: 9e8da4a476\n\nChange-Id: I591fd51bf456cd42fe8c633de8924a9f2c844866\n"
    },
    {
      "commit": "9e8da4a476d1a52d4c287747b5e1b80f61681c15",
      "tree": "415c89cc359a913198e11d65441b64a92149b472",
      "parents": [
        "f0cbd6244c2cd9767be7ac2360e1e3a762ca8420",
        "646f2d9c33677ab30f93011ddf575bb9f9c1a02d"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Mon Aug 15 23:22:04 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon Aug 15 23:22:04 2016 +0000"
      },
      "message": "AAPT: Fix use-after-free error am: 193ed74c2d\nam: 646f2d9c33\n\nChange-Id: If9fe7a52e62ae6b2900aa187996b4b785894ab03\n"
    },
    {
      "commit": "193ed74c2d9228368941de948fe03e05ca7fd3e3",
      "tree": "0f24caef0185907b0cfd9843d5c8a3b37167e313",
      "parents": [
        "58635e74edd5c5424ae22d72e6326d2ac89983bd"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Mon Aug 15 14:19:46 2016 -0700"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Mon Aug 15 14:22:36 2016 -0700"
      },
      "message": "AAPT: Fix use-after-free error\n\nRe-order deletion of ResXMLTree and the Asset object\nit iterates over.\n\nBug:30844391\nChange-Id: Ied033d0a8f93343006228a2054c6d0f42bb4717a\n"
    },
    {
      "commit": "84717d4118cff0790aecd8365029200e36a47bba",
      "tree": "341d9323e8ab24bf4809d6dc6cacec723b8d9d2a",
      "parents": [
        "2de53cbfae1dd609d6f9561eef8423c4ee811121",
        "c76aa692075acfef74349185d86062bbfec5a8c0"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Fri Aug 12 19:35:08 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Aug 12 19:35:08 2016 +0000"
      },
      "message": "resolve merge conflicts of 17bd236 to stage-aosp-master am: b3d46b44a3\nam: c76aa69207\n\nChange-Id: I6bb066d131dde297612c5dcbf5051f4964e62a8b\n"
    },
    {
      "commit": "c76aa692075acfef74349185d86062bbfec5a8c0",
      "tree": "c4a30e5a3dd3d1b6845c8471e17f041ccb0400ca",
      "parents": [
        "ef57a0d629d9b3e6e13ec5144900b9cb6d8ca5ea",
        "b3d46b44a399ba0a9b14caac8603db15089ab55b"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Fri Aug 12 19:30:02 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Aug 12 19:30:02 2016 +0000"
      },
      "message": "resolve merge conflicts of 17bd236 to stage-aosp-master\nam: b3d46b44a3\n\nChange-Id: I5123493e165c4d2ab74cf045e5fb8181886dce62\n"
    },
    {
      "commit": "b3d46b44a399ba0a9b14caac8603db15089ab55b",
      "tree": "94e2f4c534e4ae9b80dce102aa1f1b3fce89ac5c",
      "parents": [
        "ed935c32f478229220a90442da0af3c3d3fc6230",
        "17bd236b4b6b78c32a187649aa4abcf94e5951c3"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Fri Aug 12 11:35:17 2016 -0700"
      },
      "committer": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Fri Aug 12 11:44:16 2016 -0700"
      },
      "message": "resolve merge conflicts of 17bd236 to stage-aosp-master\n\nChange-Id: I08d4500aaa378b08d41e8d046c62101e08dbfba8\n"
    },
    {
      "commit": "56996ff61e4961880db1240f6a5d4f57a79512d9",
      "tree": "9b10bb98aea8906b98c87f81bae51e2d68b55e9f",
      "parents": [
        "494855abe8d8fa5d0d9c1fffd9f280843ab429f9",
        "ef57a0d629d9b3e6e13ec5144900b9cb6d8ca5ea"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Fri Aug 12 00:40:25 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Aug 12 00:40:25 2016 +0000"
      },
      "message": "resolve merge conflicts of 76ce8e5 to stage-aosp-master am: ed935c32f4\nam: ef57a0d629\n\nChange-Id: Ifcc24ad835f2e74a25954bf3fd7090c75abdc084\n"
    },
    {
      "commit": "ef57a0d629d9b3e6e13ec5144900b9cb6d8ca5ea",
      "tree": "808ba605d02650a3ee329333edf9f7a218de20f6",
      "parents": [
        "84b61fb4b0142fb54d9c288f0e90c64028871d5f",
        "ed935c32f478229220a90442da0af3c3d3fc6230"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Fri Aug 12 00:31:29 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri Aug 12 00:31:29 2016 +0000"
      },
      "message": "resolve merge conflicts of 76ce8e5 to stage-aosp-master\nam: ed935c32f4\n\nChange-Id: Ibb7415686469d7b15e8dbe0cd04226c4e0cd7d76\n"
    },
    {
      "commit": "ed935c32f478229220a90442da0af3c3d3fc6230",
      "tree": "afe24a352b95a8e8e1384e1e9d0b91a26639b7c4",
      "parents": [
        "5aa4ba3776e3017a686acc1e6f7acfd04f272d61",
        "76ce8e52422bc6121fb974ef6aab040bb5d9da51"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Thu Aug 11 16:48:46 2016 -0700"
      },
      "committer": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Thu Aug 11 16:48:46 2016 -0700"
      },
      "message": "resolve merge conflicts of 76ce8e5 to stage-aosp-master\n\nChange-Id: I4b4ca9906373a95776d2da8ba2fa39a4a78e2a30\n"
    },
    {
      "commit": "76ce8e52422bc6121fb974ef6aab040bb5d9da51",
      "tree": "493e39d0c1ba619006bcaeda9e3c041880d7f63a",
      "parents": [
        "5671277d2a84cdc4e99eb37b318ae921d4f22cdb",
        "f35c939cd70f2815582d08902ade0b9abbee6bec"
      ],
      "author": {
        "name": "Treehugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu Aug 11 23:20:47 2016 +0000"
      },
      "committer": {
        "name": "Gerrit Code Review",
        "email": "noreply-gerritcodereview@google.com",
        "time": "Thu Aug 11 23:20:47 2016 +0000"
      },
      "message": "Merge \"Fix clang-tidy warnings in libs/hwui.\""
    },
    {
      "commit": "8bd37ba458633ee7b2aeec0a7593817000aa84b2",
      "tree": "35336b2eadacdeeed7ed64b3bce40cf008a97197",
      "parents": [
        "d0197ac3402e5d85324db4230407115ddec8011a"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed Aug 10 14:15:30 2016 -0700"
      },
      "committer": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Thu Aug 11 15:20:10 2016 -0700"
      },
      "message": "Fix clang-tidy warnings in aapt and aapt2.\n\n* Add explicit keyword to conversion constructors.\n* Add NOLINT(implicit) comments for implicit conversion constructors.\nBug: 28341362\n* Use const reference type for read-only parameters.\nBug: 30407689\n* Use const reference type to avoid unnecessary copy.\nBug: 30413862\nTest: build with WITH_TIDY\u003d1\n\nChange-Id: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1\nMerged-In: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1\n"
    },
    {
      "commit": "9b8528fee4eed35b8e887ded0851d08eb2b10db6",
      "tree": "36df1cee89b3689454e6b09a6bfa5eabfb3214b1",
      "parents": [
        "7310353aeb771c109e5aea2c5415fa502eb13a7b"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed Aug 10 14:15:30 2016 -0700"
      },
      "committer": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Thu Aug 11 15:16:41 2016 -0700"
      },
      "message": "Fix clang-tidy warnings in aapt and aapt2.\n\n* Add explicit keyword to conversion constructors.\n* Add NOLINT(implicit) comments for implicit conversion constructors.\nBug: 28341362\n* Use const reference type for read-only parameters.\nBug: 30407689\n* Use const reference type to avoid unnecessary copy.\nBug: 30413862\nTest: build with WITH_TIDY\u003d1\n\nChange-Id: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1\n"
    },
    {
      "commit": "17874c98eed13596efd937611d706f7a6840f502",
      "tree": "bb7e81539f9113598b494a2669126b31437003b8",
      "parents": [
        "0486ccd263f271efe8982c8d6e101150736b2e0c",
        "53511e11960019029e6fce7631cf9d7b516358d5"
      ],
      "author": {
        "name": "Hans Boehm",
        "email": "hboehm@google.com",
        "time": "Thu Aug 11 17:45:24 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Aug 11 17:45:24 2016 +0000"
      },
      "message": "Merge \"Do not stack allocate RefBase object in AaptAssets::filter\" am: d0197ac340 am: c97c9dbd96 am: a33407d2f8\nam: 53511e1196\n\nChange-Id: Id4486595ce42e524c7db17b09e120f132976599a\n"
    },
    {
      "commit": "53511e11960019029e6fce7631cf9d7b516358d5",
      "tree": "cd575c4057fb94fea5c7916b5a375ea3712d0c17",
      "parents": [
        "7d8bf06c21ee1a23e8920481c48d2de95d91b4f4",
        "a33407d2f8a13e80a76b1493d06e443bb9c5f015"
      ],
      "author": {
        "name": "Hans Boehm",
        "email": "hboehm@google.com",
        "time": "Thu Aug 11 17:39:16 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Aug 11 17:39:16 2016 +0000"
      },
      "message": "Merge \"Do not stack allocate RefBase object in AaptAssets::filter\" am: d0197ac340 am: c97c9dbd96\nam: a33407d2f8\n\nChange-Id: If98f629f0675a01e0c9f12eb0cd1b48f497357ce\n"
    },
    {
      "commit": "a33407d2f8a13e80a76b1493d06e443bb9c5f015",
      "tree": "3f46b891847ebb7bc26560d7836ba3a49075fa03",
      "parents": [
        "93d8ffc4f3ac237e9390a8328699c8cddfad970a",
        "c97c9dbd962326bdb39b126ed2d84ed861e803c2"
      ],
      "author": {
        "name": "Hans Boehm",
        "email": "hboehm@google.com",
        "time": "Thu Aug 11 17:32:34 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Aug 11 17:32:34 2016 +0000"
      },
      "message": "Merge \"Do not stack allocate RefBase object in AaptAssets::filter\" am: d0197ac340\nam: c97c9dbd96\n\nChange-Id: I9ceb9f35c22e84a57e2c38f9e6fd562827ae7e0d\n"
    },
    {
      "commit": "c97c9dbd962326bdb39b126ed2d84ed861e803c2",
      "tree": "c3d981b79ff102dbdeac9c4d6155d01c3c57d9a3",
      "parents": [
        "bda5769701a30f6922f423b52b38066544b08d8e",
        "d0197ac3402e5d85324db4230407115ddec8011a"
      ],
      "author": {
        "name": "Hans Boehm",
        "email": "hboehm@google.com",
        "time": "Thu Aug 11 17:28:07 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Aug 11 17:28:07 2016 +0000"
      },
      "message": "Merge \"Do not stack allocate RefBase object in AaptAssets::filter\"\nam: d0197ac340\n\nChange-Id: I077f9c190025d688af17d1a840b841cbdc4e003d\n"
    },
    {
      "commit": "25dfa75ee39cb75794dd0cc088769b38bc66460a",
      "tree": "648e51c4fea0e36efe895ca343203a19c8db9362",
      "parents": [
        "f28f6bb2b0473154edb293cab0432c12756144e5"
      ],
      "author": {
        "name": "Hans Boehm",
        "email": "hboehm@google.com",
        "time": "Wed Aug 10 19:56:50 2016 -0700"
      },
      "committer": {
        "name": "Hans Boehm",
        "email": "hboehm@google.com",
        "time": "Wed Aug 10 19:56:50 2016 -0700"
      },
      "message": "Do not stack allocate RefBase object in AaptAssets::filter\n\nDoing so is likely to trigger log messages in the future, and will\nhinder diagnosis of other problems.\n\nBug: 30292538\nChange-Id: I2cb8c507e43d06d4afa7e35b564416c1474c81d1\n"
    },
    {
      "commit": "f35c939cd70f2815582d08902ade0b9abbee6bec",
      "tree": "91a0082ee6b720d011d18567a72c1c547920b6a8",
      "parents": [
        "5cfe8a83157b933e0bcaa2592f1f09d4555ca212"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed Aug 10 14:08:35 2016 -0700"
      },
      "committer": {
        "name": "Chih-hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed Aug 10 23:26:59 2016 +0000"
      },
      "message": "Fix clang-tidy warnings in libs/hwui.\n\n* Add explicit keyword to conversion constructors.\nBug: 28341362\n* Use const reference type for read-only parameters.\nBug: 30407689\nTest: build with WITH_TIDY\u003d1\n\nChange-Id: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda\nMerged-In: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda\n"
    },
    {
      "commit": "49796451cb9d1dae580618eb320ef3c5e6d90cd4",
      "tree": "41cc259d150f06a83fa67ffefd32e40546866d5d",
      "parents": [
        "04db685ce5ceb34d8fd6436254d22324c829bfd9"
      ],
      "author": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed Aug 10 14:08:35 2016 -0700"
      },
      "committer": {
        "name": "Chih-Hung Hsieh",
        "email": "chh@google.com",
        "time": "Wed Aug 10 16:01:29 2016 -0700"
      },
      "message": "Fix clang-tidy warnings in libs/hwui.\n\n* Add explicit keyword to conversion constructors.\nBug: 28341362\n* Use const reference type for read-only parameters.\nBug: 30407689\nTest: build with WITH_TIDY\u003d1\n\nChange-Id: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda\n"
    },
    {
      "commit": "4c938157366ad1e670c649b5505c8de42206f642",
      "tree": "5cfdddab248a0be1743b582f130231d3e70c0576",
      "parents": [
        "25b9724575275e330a1426328a500eebc4c05866",
        "84877752eebf1bf794dfa73b76cbd3bfe3f2d1f9"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Thu Aug 04 02:12:35 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Aug 04 02:12:35 2016 +0000"
      },
      "message": "AAPT: Fix feature split generation of ID resources am: 4d219da3c4 am: e69f9ca938\nam: 84877752ee\n\nChange-Id: I335e0fef88cd0ba7e1dd712c6659d7a799a34fbb\n"
    },
    {
      "commit": "84877752eebf1bf794dfa73b76cbd3bfe3f2d1f9",
      "tree": "c5c61bcafd7e12c42e3b72398fabc87370771b1e",
      "parents": [
        "027a598c247509564bf231e9bbc512d50f1650ca",
        "e69f9ca9384f718cacc353edbd5d5fccaab616c3"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Thu Aug 04 02:00:28 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Aug 04 02:00:28 2016 +0000"
      },
      "message": "AAPT: Fix feature split generation of ID resources am: 4d219da3c4\nam: e69f9ca938\n\nChange-Id: I2021dbffcd9e6fb8bca79c181d2bf8e8524ee5d2\n"
    },
    {
      "commit": "e69f9ca9384f718cacc353edbd5d5fccaab616c3",
      "tree": "ff18c33658a874b396ea7683671fc14e6027b580",
      "parents": [
        "82c686b714670a8919d939cfc46c918d3628f177",
        "4d219da3c43f12ff000e685ae069374b618b30fc"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Thu Aug 04 01:46:43 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu Aug 04 01:46:43 2016 +0000"
      },
      "message": "AAPT: Fix feature split generation of ID resources\nam: 4d219da3c4\n\nChange-Id: I0cc7e1174020e4bd813b4442e2c35fdc2f9513fd\n"
    },
    {
      "commit": "59a91c04cc9cd6f68d232e8b680a000208a878d6",
      "tree": "c8a93d01c2ddd7e69a7e34223925311b8897c49e",
      "parents": [
        "6c955db797bfddef6eb1aaf66fa82251e767e710",
        "4d219da3c43f12ff000e685ae069374b618b30fc"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu Aug 04 01:27:33 2016 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu Aug 04 01:27:34 2016 +0000"
      },
      "message": "Merge \"AAPT: Fix feature split generation of ID resources\" into nyc-mr1-dev"
    },
    {
      "commit": "4d219da3c43f12ff000e685ae069374b618b30fc",
      "tree": "d9653ade178f9bbd605d7bfb399f24c8800e809d",
      "parents": [
        "76af60554ca5c74a8327774fdc4bf758f7eb518f"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Wed Aug 03 15:40:19 2016 -0700"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Wed Aug 03 16:54:15 2016 -0700"
      },
      "message": "AAPT: Fix feature split generation of ID resources\n\nID resources that get generated on demand with the\nnotation @+id/name were previously not given the\nappropriate type ID offset when being built as feature\nsplits.\n\nThis change declares an ID type ahead of time so that\nthe type ID offset is applied before IDs can be generated.\n\nBug:30607637\nChange-Id: I122a9133cb01b35e9892103ec52fc228dc65bf1a\n"
    },
    {
      "commit": "72979573d925d4def627d7fef29ea8ee920c934e",
      "tree": "24038d74e8451b8006b3f24a49ea878fe59c8c5e",
      "parents": [
        "4453f846f9d7d7fdfa3a6c88b8f453b8c5762477",
        "12e5b87771d176dd2941db6f01b4034f9ac444a1"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Tue Aug 02 02:57:35 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Aug 02 02:57:35 2016 +0000"
      },
      "message": "AAPT: faketouch feature implied if no touchscreen feature requested. am: ca955a4c3a am: 76cbcd495e\nam: 12e5b87771\n\nChange-Id: Idf7c77d4122ab88b0fe1a1b3c42a196fd532d45c\n"
    },
    {
      "commit": "12e5b87771d176dd2941db6f01b4034f9ac444a1",
      "tree": "c139113783c10d2f9a283f0dff0b353d4339e22e",
      "parents": [
        "dd720d6ba5352609a2bd309699b6ef135ac0f90d",
        "76cbcd495e55548aaeb18ce3bd10ad1924e11b07"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Tue Aug 02 02:01:37 2016 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue Aug 02 02:01:37 2016 +0000"
      },
      "message": "AAPT: faketouch feature implied if no touchscreen feature requested. am: ca955a4c3a\nam: 76cbcd495e\n\nChange-Id: I29700574c70f35695ccbdd60c570bb222e1aa0eb\n"
    },
    {
      "commit": "ca955a4c3ab3d4b83c6e9d5278bcd8d2258d44ad",
      "tree": "8025b9dd11a9d1a6a2c5f8ee40a214f076ae79d4",
      "parents": [
        "76af60554ca5c74a8327774fdc4bf758f7eb518f"
      ],
      "author": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Mon Aug 01 16:44:29 2016 -0700"
      },
      "committer": {
        "name": "Adam Lesinski",
        "email": "adamlesinski@google.com",
        "time": "Mon Aug 01 17:20:28 2016 -0700"
      },
      "message": "AAPT: faketouch feature implied if no touchscreen feature requested.\n\nThis changes the default implied feature of \u0027android.hardware.touchscreen\u0027\nto \u0027android.hardware.faketouch\u0027 if no \u0027android.hardware.touchscreen\u0027\nfeature is requested, required or otherwise.\n\nBug:30571641\nChange-Id: I1e41242d4b1dc549cf69741d2a309baf476d084e\n"
    }
  ],
  "next": "f580d91dabc443301e2adcfc74509bec9b1960ff"
}
