)]}' { "log": [ { "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" }, { "commit": "f580d91dabc443301e2adcfc74509bec9b1960ff", "tree": "c0d94140e92d3b6663028d85eca76c364eb67967", "parents": [ "554881712c6c74d7dcffec3061ccc50371e9c468" ], "author": { "name": "Ivan Gavrilovic", "email": "gavra@google.com", "time": "Tue Jul 19 12:03:33 2016 +0100" }, "committer": { "name": "Ivan Gavrilovic", "email": "gavra@google.com", "time": "Wed Jul 20 15:38:48 2016 +0100" }, "message": "Aapt main dex proguard rules - always keep application\n\nAapt with -D option was not keeping the application and instrumentation\nsubclasses, which were instead handled by mainDexClasses.rules. Instead,\ninclude them in the aapt -D output.\n\nChange-Id: Ia3b89fc2edd45d379c4d06f0bf674716646fcb3d\n" }, { "commit": "1a7d992ceaa61f6e146c1ccd45a0ffd3ed2ff832", "tree": "42c7d803835a0f6c41c26b844ae4e6cf4a05beeb", "parents": [ "dd968c7e1b9590b1065d4c1cf6375d4d964037d3", "28250b60098c99425ca0cabab476ec50817e11e8" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Jul 19 01:52:01 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 19 01:52:01 2016 +0000" }, "message": "Merge \\\\\"AAPT: Don\\\\\u0027t keep processing files that failed to be added\\\\\" into nyc-mr1-dev am: d94f55552f\nam: 28250b6009\n\nChange-Id: Ibdc265278fea76d4d8a7ac478a80ffdcd827fd16\n" }, { "commit": "28250b60098c99425ca0cabab476ec50817e11e8", "tree": "98f157aa73f6e0b9e4b2f2cd702d632b463407b9", "parents": [ "622d3577ca079c2e27f414d4042d1c2dac7771d1", "d94f55552f4d4526c4b388b6616fb4afb8edb0b0" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Jul 19 01:41:14 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 19 01:41:14 2016 +0000" }, "message": "Merge \\\"AAPT: Don\\\u0027t keep processing files that failed to be added\\\" into nyc-mr1-dev\nam: d94f55552f\n\nChange-Id: I9f91b3b8a66a2bd0d1fc27ddcdea2f72f0a54b58\n" }, { "commit": "526d73be4a3a2714fa6112769e16fb6cd0194451", "tree": "5b1f6862bed22be84c5547ad0bb2b2c317604b45", "parents": [ "699e1bc74bb00d81b9680c826828678847caf205" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Jul 18 17:01:14 2016 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Jul 18 17:07:41 2016 -0700" }, "message": "AAPT: Don\u0027t keep processing files that failed to be added\n\nAAPT will continue ahead without reporting an error if a file\nfailed to be added to the ResourceTable. This would cause crashes\nlater when the file was assumed to be present.\n\nBug:30200166\nChange-Id: Ieb2daf97ccf0345153b6f4598d130a38d108c937\n" }, { "commit": "6feeeabd209e74c0bef08e62e63b81e21895b800", "tree": "47036d116cebc1be5bd5c548bb91cb9e3c62d358", "parents": [ "73228f754db3636c171c0ef5bf81baf557906ee1", "1deedbacc36cfd943444c7147a09a892a8c0ad1b" ], "author": { "name": "Sergio Giro", "email": "sgiro@google.com", "time": "Thu Jul 14 18:07:33 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 14 18:07:33 2016 +0000" }, "message": "Add bound checks to utf16_to_utf8\nam: 1deedbacc3\n\nChange-Id: I05847ae2c26a266b3c05324230062757e6978fd2\n" }, { "commit": "1deedbacc36cfd943444c7147a09a892a8c0ad1b", "tree": "b56cab28b7187f2c34b6ac4c9e305bcafc7aedc7", "parents": [ "17b221792a333401e6a4c032ae8c46992109732d" ], "author": { "name": "Sergio Giro", "email": "sgiro@google.com", "time": "Tue Jun 28 18:26:10 2016 +0100" }, "committer": { "name": "Sergio Giro", "email": "sgiro@google.com", "time": "Thu Jul 14 13:27:53 2016 +0000" }, "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": "10de3af152fc8612db08f3787fd17e70122b7486", "tree": "1fef18a8c6fc3993366bf08ea051172d2952b61d", "parents": [ "994111f00f9827c89014c454fd00b407d2472b4d" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Jul 13 10:14:03 2016 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Jul 13 17:55:36 2016 -0700" }, "message": "AAPT: Improve debuggability of aapt dump badging errors\n\nAAPT dump badging errors have been cryptic and difficult\nto debug for app developers. Added some line info to the\nerror statements.\n\nChange-Id: Ieeeb903a1274a91b77329b445e0248b1e67c9568\n" }, { "commit": "fb5cfc3543e7905476f3602b854f8458d7927422", "tree": "c455f691258cbd6f9428da62f72eb28df31ef1a3", "parents": [ "177c82be7931a5b4df9fe019462bfe24e49864f6", "daad138428b6b38c23f3412f3531e9edad617ef6" ], "author": { "name": "Sergio Giro", "email": "sgiro@google.com", "time": "Tue Jul 12 01:46:30 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 12 01:46:30 2016 +0000" }, "message": "Merge \\\\\"Add bound checks to utf16_to_utf8\\\\\" into nyc-mr1-dev am: 49c410bc48\nam: daad138428\n\nChange-Id: I5a660dccb76e823736a59e50904a7279a97ef849\n" }, { "commit": "daad138428b6b38c23f3412f3531e9edad617ef6", "tree": "1bbb15a74d14b94538d1f22c1592c20a63676ff5", "parents": [ "915d09b5d4688ec90a95f785a54ca236f2119b37", "49c410bc48c47b636c239e6e3c590f77f1b7fd23" ], "author": { "name": "Sergio Giro", "email": "sgiro@google.com", "time": "Mon Jul 11 12:22:30 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jul 11 12:22:30 2016 +0000" }, "message": "Merge \\\"Add bound checks to utf16_to_utf8\\\" into nyc-mr1-dev\nam: 49c410bc48\n\nChange-Id: I9a226afc143db459184a279167f0dce66c0f32df\n" }, { "commit": "49c410bc48c47b636c239e6e3c590f77f1b7fd23", "tree": "aad1f9f0d3f21916db6eb609423bef73939ab7ba", "parents": [ "acdd639513858629f804316e9dd4105634504a90", "4781057e78f63e0e99af109cebf3b6a78f4bfbb6" ], "author": { "name": "Sergio Giro", "email": "sgiro@google.com", "time": "Mon Jul 11 12:11:30 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jul 11 12:11:31 2016 +0000" }, "message": "Merge \"Add bound checks to utf16_to_utf8\" into nyc-mr1-dev" }, { "commit": "4781057e78f63e0e99af109cebf3b6a78f4bfbb6", "tree": "335738441e68edc71daabc00214df505f6d45c04", "parents": [ "4b736ea56d5301381838c80b2333a05df1eb499e" ], "author": { "name": "Sergio Giro", "email": "sgiro@google.com", "time": "Tue Jun 28 18:26:10 2016 +0100" }, "committer": { "name": "Sergio Giro", "email": "sgiro@google.com", "time": "Sat Jul 02 17:46:20 2016 +0100" }, "message": "Add bound checks to utf16_to_utf8\n\nTest: ran libaapt2_tests64\nBug: 29250543\nChange-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3\n" }, { "commit": "f69d5146bd5411799821fde612392a3fc4e1dbfb", "tree": "80fd500a40c1a3721c779face81796b075bbb778", "parents": [ "ba83347bc6ab3464fb86cb24f39e0f43fab65ebc", "8a24cfb05583430ab4767e74de8459b9e319cc65" ], "author": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Wed Jun 22 21:36:56 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 21:36:56 2016 +0000" }, "message": "Merge \\\\\"Don\\\\\u0027t match locales with different scripts in ResourceFilter\\\\\" into nyc-mr1-dev am: 9d2a3188fa\nam: 8a24cfb055\n\nChange-Id: I0c3e03c508680edd7db133b5cc93dbab1383b960\n" }, { "commit": "8a24cfb05583430ab4767e74de8459b9e319cc65", "tree": "ccf6babeb2d67ba773ae5a2643b8278bae491a8c", "parents": [ "eafd6a2c2d4335e61410b0d39511a91cb4bbf430", "9d2a3188fabbcc8c1c8d334f34f2e1c73b943a27" ], "author": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Wed Jun 22 21:26:29 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 21:26:29 2016 +0000" }, "message": "Merge \\\"Don\\\u0027t match locales with different scripts in ResourceFilter\\\" into nyc-mr1-dev\nam: 9d2a3188fa\n\nChange-Id: I9874c4a5d880407ed7b38e63f2c551defedbf8e5\n" }, { "commit": "3f32c27ccfee10e77f850747b50f6df76b150805", "tree": "1764b829f66c0f7fb887416476e8a57e663d9107", "parents": [ "73939d8a60c342556dcd21f89769b650c04ecfd0" ], "author": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Tue Jun 21 14:16:40 2016 -0700" }, "committer": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Tue Jun 21 15:03:51 2016 -0700" }, "message": "Don\u0027t match locales with different scripts in ResourceFilter\n\nPreviously, AAPT would match locales even if they had different\nexplicit scripts if the requested locale was just a languages. Now\nwe require explicit listing of the languages with different explicit\nscripts in order for the locale to be included.\n\nBug: 29412034\nChange-Id: Ia118a5a7f9aec49f6c3c53b9195a0ae1a57f53fd\n" }, { "commit": "1ec2fd72cea31d46cca6e8f6686115fabe885664", "tree": "bfc94920e07b50f6850e74d29b3ae39dc2eae768", "parents": [ "e9061cf164109abde6b50d9fbd44c49ffa5dfa7e", "032dcff2012e1b60848b5834bfdcacf432021207" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu May 19 23:51:32 2016 +0000" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu May 19 23:51:32 2016 +0000" }, "message": "stephenli@ manually merge many commits up to \u0027032dcff\u0027\n\n* commit \u0027032dcff\u0027: (22 commits)\n Remove outdated google services links.\n Fix misc-macro-parentheses warnings in services jni.\n Fix misc-macro-parentheses warnings in hwui and graphic jni.\n Fix misc-macro-parentheses warnings in aapt and androidfw.\n docs: Update to column widths for Complications table\n Fix a11y crash when window layer isn\u0027t unique.\n Never set resized while not drag resizing for pinned stack.\n While turning OFF do not honor ON requests.\n Fix GATT autoConnect race condition\n Fix GATT autoConnect race condition\n Fix RTL issue in delete dialog.\n Incorporate feedback on new wallpaper-related APIs\n Mapping up/down of legacy Gps vs. Gnss Status\n Fixed a bug where the chronometer was invisible\n Fixed a bug where the chronometer wasn\u0027t updating the time\n Update BlockedNumberContract javadocs.\n [RenderScript] Fix ScriptIntrinsicBlur documentation.\n Update documentation about copyTo and copyFrom.\n DO NOT MERGE Cherry pick libpng usage fixes\n Start the Wear Time System Service with SystemServer\n ...\n" }, { "commit": "d5bb8487d58b168543d6504504d8e89e062a6b8b", "tree": "04141ad55e6024f3f2ab8fdb95f6ff7d4e0a9e4d", "parents": [ "03df42268995e3742aeb42ee6a77048dcc8fd889", "f55c9f7aa64660712242705d4e5e89e2191bbf69" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu May 19 23:34:58 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 19 23:34:58 2016 +0000" }, "message": "Merge \"Fix misc-macro-parentheses warnings in aapt and androidfw.\" am: 6f4b566169\nam: f55c9f7aa6\n\n* commit \u0027f55c9f7aa64660712242705d4e5e89e2191bbf69\u0027:\n Fix misc-macro-parentheses warnings in aapt and androidfw.\n\nChange-Id: I23f28430cf242be3f77926016626ea3e5705d4ec\n" }, { "commit": "e819d01e3e120844e95cc4c534382d20d2beb623", "tree": "d2d192e309391e5c132f7be7de4a472bb290e44e", "parents": [ "4bc3d32b15cdcae7685722e7a20007c7aa9ae949" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Thu May 19 15:19:22 2016 -0700" }, "committer": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Thu May 19 15:19:22 2016 -0700" }, "message": "Fix misc-macro-parentheses warnings in aapt and androidfw.\n\nBug: 28705665\nChange-Id: Iac353e66718aadad384183cf300330695df25909\n" }, { "commit": "0935d0132b732e83c2130c3f1c835c7c0d117f14", "tree": "a2d7b5bf30dfbea10a6d2271ac4d3e4d3df19bb6", "parents": [ "1916f6a91cc38f214397b9553cee8c84717b9af8", "fab894efdece38ec9f3df1adedf79eb148bc6bda" ], "author": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Mon May 16 13:33:17 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 16 13:33:17 2016 +0000" }, "message": "Merge \"Stop emitting javadoc for @removed attributes.\" into nyc-dev am: c4033e7c66 am: 1d10d94396\nam: fab894efde\n\n* commit \u0027fab894efdece38ec9f3df1adedf79eb148bc6bda\u0027:\n Stop emitting javadoc for @removed attributes.\n\nChange-Id: Icbaa4eb19326d2ec41be78016665553a1b7beef0\n" }, { "commit": "feaf99fa1b7563f15dbd4211718a6cfb7a3cc3c8", "tree": "ea11ecd04a1908a46e0039a154f21a84453229b0", "parents": [ "6f9f75e1063d282c933ede862fa7ea9371a2f310" ], "author": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Fri May 06 17:16:06 2016 +0100" }, "committer": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Mon May 09 14:51:41 2016 +0100" }, "message": "Stop emitting javadoc for @removed attributes.\n\nWe need the attributes to remain public because people might still be\nlinking against them, but we don\u0027t want them showing up in the\ndocumentation any more. Them showing up in the documentation also had\nthe side effect that it would accidentally mark the parent class of\nattributes as @removed, which was not intended.\n\nBug: 28663748\n\nChange-Id: I2f6eb09455fddf1086e6b24bc3bea5292e8e32b7\n" }, { "commit": "d53e3bed1ca4a14b2a86d53eaef6969bd043176e", "tree": "887a75bd3c30064ed2a00c484fd25cbf5d921ccf", "parents": [ "5b93c24bc08d91cd8d6c4701e4dbfa3ddb802753" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Tue May 03 10:02:51 2016 -0700" }, "committer": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Tue May 03 10:02:51 2016 -0700" }, "message": "Fix google-explicit-constructor warnings.\n\nBug: 28341362\nChange-Id: I080090d50f1a368a4e7c1a0732297bb6a295e34f\n" }, { "commit": "682583c8902efbd33d4394131a2214ce94469535", "tree": "16b35113be2d432f6b58948de3b4f9045aace8e1", "parents": [ "987609f5a7bd8e18559334aa0260e6614520af13" ], "author": { "name": "Rohit Agrawal", "email": "rohitagr@google.com", "time": "Thu Apr 21 16:29:58 2016 -0700" }, "committer": { "name": "Rohit Agrawal", "email": "rohitagr@google.com", "time": "Wed Apr 27 19:50:55 2016 +0000" }, "message": "AAPT: ProGuard config for components in main dex.\n\nCreate an analogue of \"aapt -G\" which outputs a proguard configuration\nthat keeps only components which need to be in the main dex.\n\nBug: 27383099\nBug: 28425556\n\nChange-Id: Ic18c8c563794ff27a5598a214111d1b446a005f1\n(cherry picked from commit 86229cb622fccde8ab8cbe85eead91a34313a708)\n" }, { "commit": "6ba873faec0d165b74acfecf1533f58433d431e9", "tree": "8548bea7027c47e34a7ef03072821c82c536f022", "parents": [ "cd4f7e12037acd16f500dc9a4be98e51fe58a11b" ], "author": { "name": "Rohit Agrawal", "email": "rohitagr@google.com", "time": "Thu Apr 21 16:29:58 2016 -0700" }, "committer": { "name": "Rohit Agrawal", "email": "rohitagr@google.com", "time": "Wed Apr 27 11:26:55 2016 -0700" }, "message": "AAPT: ProGuard config for components in main dex.\n\nCreate an analogue of \"aapt -G\" which outputs a proguard configuration\nthat keeps only components which need to be in the main dex.\n\nBUG: 27383099\n\nChange-Id: Ic18c8c563794ff27a5598a214111d1b446a005f1\n(cherry picked from commit 86229cb622fccde8ab8cbe85eead91a34313a708)\n" }, { "commit": "86229cb622fccde8ab8cbe85eead91a34313a708", "tree": "e84bce78081f926623a45c5f222a79c31d207acb", "parents": [ "6a86fbe69d48c18ad1414ee04941ebc7f6a4eb0b" ], "author": { "name": "Rohit Agrawal", "email": "rohitagr@google.com", "time": "Thu Apr 21 16:29:58 2016 -0700" }, "committer": { "name": "Rohit Agrawal", "email": "rohitagr@google.com", "time": "Thu Apr 21 18:00:53 2016 -0700" }, "message": "AAPT: ProGuard config for components in main dex.\n\nCreate an analogue of \"aapt -G\" which outputs a proguard configuration\nthat keeps only components which need to be in the main dex.\n\nBUG: 27383099\n\nChange-Id: Ic18c8c563794ff27a5598a214111d1b446a005f1\n" }, { "commit": "694d0a7dfd281060c9f8d92a79bda1b7071affe3", "tree": "f28cbf08b0cb51a36d0da06980eca6e15019a029", "parents": [ "50e439df28f1ceb76c229543f93f0b3f6ea05793" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Apr 06 16:12:04 2016 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Apr 06 16:40:23 2016 -0700" }, "message": "AAPT: Dump uses-feature version in dump badging\n\nBug:27162500\nChange-Id: I4f82cdd8ef1801c92d4ea6b4bb982c6e7d91edb5\n" }, { "commit": "6e452f9e8a42f0f1217d25c9cf6017abdd5be08a", "tree": "c0c74cb35eacea4860557c61d2dc637c7ee290bd", "parents": [ "2edfe0106a3c7a2c834f9bae3f5e558fd8b9cdcf" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Apr 04 15:39:40 2016 +0900" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Apr 04 15:39:40 2016 +0900" }, "message": "Don\u0027t try to compress .mkv resources\n\nBug: 27987970\nChange-Id: I58e920e81d1e79b7fbba479d8fb34afb3911f97d\n" }, { "commit": "08a3fa7dea522112cbeab954a396845f7d638779", "tree": "4c3d1b2332cdc2dab3a3acab76f4b50987f13f1b", "parents": [ "3db45036df6b0fe32574b806e8ee5128719bae29", "299e488ee28e75b96c23a8a37fdff2ec0f4ccb98" ], "author": { "name": "Andrew Johnson", "email": "aqj@google.com", "time": "Thu Mar 31 13:52:09 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Mar 31 13:52:10 2016 +0000" }, "message": "Merge \"Removing assignments to localeScriptWasComputed in aapt.\" into nyc-dev" }, { "commit": "299e488ee28e75b96c23a8a37fdff2ec0f4ccb98", "tree": "1fd31bc0dca0ab40da1a47bd3e56baae31f53256", "parents": [ "8a8e8ea19a825dd45117909df2f0140ca20565e7" ], "author": { "name": "Andrew Johnson", "email": "aqj@google.com", "time": "Wed Mar 30 17:16:45 2016 -0400" }, "committer": { "name": "Andrew Johnson", "email": "aqj@google.com", "time": "Wed Mar 30 20:24:48 2016 -0400" }, "message": "Removing assignments to localeScriptWasComputed in aapt.\n\nOn certain devices running Android M with unknown vendor\nmodifications. Setting the localeScriptWasComputed bit in\nthe resource parameters struct causes the translations\nfor many languages to fail to load. The app then\ndefaults to English.\n\nThis has been reported on the following devices:\nMotorola XT1086, XT1096, and XT1586, HTC One, and Huawei\nMediaPad 10 LINK.\n\nThis change works around the issue by never setting\nlocaleScriptWasComputed in aapt and instead always\nwriting the default value of false.\n\nBug: 27872476\nChange-Id: Id638d1d0e5f9dcb1c02e65d67667d76174c69b9e\n" }, { "commit": "d126b1ed5d3a89deadaf7a9d1a9e64a48b53d2ce", "tree": "bdcfae43976837878fe9f6e132ae3b8c2f283da3", "parents": [ "68e5b9601a9730dfccc5ce8412be3fbe087a3bfc", "48efde4fb14cfe160747a8148b8e1a810c8f1c6e" ], "author": { "name": "Matt Sarett", "email": "msarett@google.com", "time": "Mon Mar 21 18:26:18 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Mar 21 18:26:19 2016 +0000" }, "message": "Merge \"Work-around paletted image decoding bug in SDK_JELLYBEAN\" into nyc-dev" }, { "commit": "48efde4fb14cfe160747a8148b8e1a810c8f1c6e", "tree": "8434e93fc9109a3b8db7e0fe604ad984a94f2227", "parents": [ "dbdca5b29989ce2c0cacfeea99db03b799cc3fb7" ], "author": { "name": "Matt Sarett", "email": "msarett@google.com", "time": "Wed Mar 16 18:22:59 2016 -0400" }, "committer": { "name": "Matt Sarett", "email": "msarett@google.com", "time": "Wed Mar 16 18:36:06 2016 -0400" }, "message": "Work-around paletted image decoding bug in SDK_JELLYBEAN\n\nBecause there is a bug decoding paletted images in SDK_JELLYBEAN,\nwe need to avoid encoding paletted images for apps that support\nSDK_JELLYBEAN and earlier.\n\nBUG\u003d27643907\n\nChange-Id: Ib7d51ed87435cd36507915d62b0057c06f18b2b6\n" }, { "commit": "7960898f6f886aadda1dd3d7a89106dde9f44217", "tree": "a69917218d192b8050ffeb70b39e0cfaee75c32e", "parents": [ "ba5c35b79731e91edc4d452d5e6b49a8b5434a55" ], "author": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Thu Mar 03 15:06:46 2016 -0800" }, "committer": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Thu Mar 03 15:19:37 2016 -0800" }, "message": "Fix script-related parts of locale resource matching\n\nPreviously, a bit was kept to find if the script of a locale was\nexplicitly \"provided\" in a resource. This was not backward\ncompatible, and failed in some edge cases when the package was\ncreated with older versions of AAPT that did not set the bit.\n\nThe cases would happen when the old resource had an explicit script\nspecified in its locale, but since the \"provided\" bit was not set in\nthe package, we would assume that the script was computed by us.\n\nThis CL replaces the \"provided\" bit with a \"computed\" bit, so the\ndefault value of the bit (set to \"false\" for old packages) would be\ncorrect.\n\nBug: 27156990\nChange-Id: I99e7f1ad8f70c90e25ab3640ed34cc1a6f8d1d64\n" }, { "commit": "afc79be228596c56ea68c0d2fa22d0a8d733be47", "tree": "3b1d5a93a03008c7b43aee3f2c25132648f5b2ba", "parents": [ "187b9b9e5bb3c6a83a26f2ece23a6cfa16614d03" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Feb 22 09:16:33 2016 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Feb 26 15:57:59 2016 -0800" }, "message": "AAPT: Allow duplicate attribute definitions if identical\n\nThis allows libraries to coexist a bit easier, since a lot of them\ndeclare the same attribute. When used together they cause errors.\nBug:27101533\n\nChange-Id: I649cf17bc587c4814f849d5ac522daf74495adcf\n" }, { "commit": "525db2489d8bb1204225e697171d3f18b6fc9695", "tree": "6c9f60b63d3671207434076861354c388f2ae811", "parents": [ "c25283b5e206ceae2aa6eb01877b79c3c1f0adfb" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Feb 25 23:13:08 2016 +0000" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Feb 25 23:13:08 2016 +0000" }, "message": "Revert \"AAPT: Allow duplicate attribute definitions if identical\"\n\nThis reverts commit c25283b5e206ceae2aa6eb01877b79c3c1f0adfb.\n\nChange-Id: I2f42a4360fa53c4333494afe0178dcec56d62d8e\n" }, { "commit": "c25283b5e206ceae2aa6eb01877b79c3c1f0adfb", "tree": "b76246dd9a2392ffe2ffd670dc3893ffb7ca1807", "parents": [ "62e1f4891773eecbd144d58e05c61562bb46d2eb" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Feb 22 09:16:33 2016 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Feb 22 09:25:06 2016 -0800" }, "message": "AAPT: Allow duplicate attribute definitions if identical\n\nThis allows libraries to coexist a bit easier, since a lot of them\ndeclare the same attribute. When used together they cause errors.\nBug:27101533\n\nChange-Id: I10327251636392e810637a79e7c9aa514f3f07a6\n" }, { "commit": "9e1923d02fbc161abe107c814224c594cb4beb56", "tree": "215e20cc10d89e9466c6cdb1f297737653cca62b", "parents": [ "59e04c6f92da584b322c87072f18e6cab4de4c60" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Feb 11 14:17:25 2016 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Feb 11 14:17:25 2016 -0800" }, "message": "AAPT: Remove warnings for public resources without comments\n\nThere are so many public resources that do not warrant comments\nthat having a warning that no one cares about is just producing\nlog spam.\n\nBug:21495023\nChange-Id: I84e3b39c7139ee67fb5cb711d5ab466d8f4ef2e0\n" }, { "commit": "37a866e9a6e325a6bcebd052e959ff264a34dd6a", "tree": "0ecf9fef4f6482850d5c5eb785e827d33c137e65", "parents": [ "4c95e0b4df62918d6e2abf9878ad4a7e7bb54123", "33fcd11bc296fa495a4f4584f782c1c0fe4fe592" ], "author": { "name": "Matt Sarett", "email": "msarett@google.com", "time": "Mon Feb 01 15:22:42 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Feb 01 15:22:42 2016 +0000" }, "message": "Merge \"Encode paletted PNGs more efficiently (part 2)\"" }, { "commit": "33fcd11bc296fa495a4f4584f782c1c0fe4fe592", "tree": "fb44746d2dfeda5dfd09522810a2ea789ea8141b", "parents": [ "fc1159c808962a32746cbddd088ed069f78afcc2" ], "author": { "name": "Matt Sarett", "email": "msarett@google.com", "time": "Fri Jan 29 18:02:41 2016 -0500" }, "committer": { "name": "Matt Sarett", "email": "msarett@google.com", "time": "Mon Feb 01 14:15:35 2016 +0000" }, "message": "Encode paletted PNGs more efficiently (part 2)\n\nMany PNGs have multiple distinct pixels with zero alpha. This\nCL allows us to treat all of those pixels as a single zero pixel.\n\nThis saves space in the color palette and also may help save\nmemory pages when we skip writing zeros.\n\nThere is also a potential disadvantage: if someone intended to decode\nthis image as unpremultiplied with particular transfer modes where\ntheir color components have an effect even though alpha is zero,\nthis will prevent that. At the moment, we do not support unpremul as\na source, so this won\u0027t affect anyone trying to draw with the view\nsystem.\n\nThis change originated in:\nhttps://googleplex-android-review.git.corp.google.com/#/c/854580/\n\nChange-Id: I702c7bd22d431cc7c775ed29bbd73c930f945ca3\n" }, { "commit": "2a84e23399840dc365cd03edcbfcf2727a17cd6e", "tree": "cd5ded413e882134f7c62ae0cfdaa606e1d0769f", "parents": [ "795c458c89418885f146f40b8d4de96fb0d08ffe" ], "author": { "name": "Matt Sarett", "email": "msarett@google.com", "time": "Thu Jan 28 18:38:38 2016 -0500" }, "committer": { "name": "Matt Sarett", "email": "msarett@google.com", "time": "Mon Feb 01 09:03:34 2016 -0500" }, "message": "Encode paletted PNGs more efficiently\n\nSaves about 2 MB of encoded size across affected assets.\n\nAlso will enable more efficient decoding.\n\nSpecifically, encoded palette values are assumed to be opaque unless\nalpha values are provided in a tRNS chunk. Before this change, we\nwould wastefully store many opaque alpha values in tRNS chunk.\nAdditionally, the decoder used to need to premultiply all of these\nopaque colors, because the encoded data indicated that they had alpha.\n\nChange-Id: Id21b3b31850c9db6149ced6d20ed5e0ce2d71c5b\n" }, { "commit": "3c7235d3868d4bf554d4c1700ac11fc3d4125c71", "tree": "51e11327490ba6ee3f0b2e9201239cf02a1d3d6c", "parents": [ "795c458c89418885f146f40b8d4de96fb0d08ffe" ], "author": { "name": "Matt Sarett", "email": "msarett@google.com", "time": "Thu Jan 28 18:38:38 2016 -0500" }, "committer": { "name": "Matt Sarett", "email": "msarett@google.com", "time": "Fri Jan 29 22:56:45 2016 +0000" }, "message": "Encode paletted PNGs more efficiently\n\nSaves about 2 MB of encoded size across affected assets.\n\nAlso will enable more efficient decoding.\n\nSpecifically, encoded palette values are assumed to be opaque unless\nalpha values are provided in a tRNS chunk. Before this change, we\nwould wastefully store many opaque alpha values in tRNS chunk.\nAdditionally, the decoder used to need to premultiply all of these\nopaque colors, because the encoded data indicated that they had alpha.\n\nChange-Id: I1d5400f71a0e3cb800fd0fc68a04c8c4069da8ef\n" }, { "commit": "b927c559e1ef8530b08712507f320502627db298", "tree": "f0d2fd051cb4486239e6f6187e0da53e416fdaeb", "parents": [ "ac3e599069e1b87ea190f008aef60a506c8561c7" ], "author": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Fri Jan 15 11:23:42 2016 -0800" }, "committer": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Thu Jan 21 13:47:22 2016 -0800" }, "message": "Implement smarter locale resource selection\n\n* Add support for determining script from language and region.\n* Add support for determining special parents of locales.\n* Add support for smart comparison of locales with only a difference\n in region, using the locale parentage tree.\n* Fix LocaleData.matchScore() to not fallback to old locale matching\n behavior if we can\u0027t determine a script.\n* Allow four-character variant codes. (Previously, only five- to\n eight-character variant codes were allowed.)\n\nBug: 7296673\nBug: 26589793\nChange-Id: Ibde0a48c0564ff383b41068095a5cbacfe7b94bc\n" }, { "commit": "46736ec81c2a35d450b2c2d86ca3423cd92a225d", "tree": "47e971fdba33b805440a12bf58fdaca3df1281b0", "parents": [ "3ee3b9d17b2aec84e791f3efa6b9453cab0d9c9b", "2edfa8c9b00cd0c0bd18738f75e0928394b99c76" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Sat Jan 16 02:25:22 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Jan 16 02:25:22 2016 +0000" }, "message": "Merge \"Make the appropriate cast to protect from mingw.\" am: dbf8c17bd2\nam: 2edfa8c9b0\n\n* commit \u00272edfa8c9b00cd0c0bd18738f75e0928394b99c76\u0027:\n Make the appropriate cast to protect from mingw.\n" }, { "commit": "2edfa8c9b00cd0c0bd18738f75e0928394b99c76", "tree": "108f5a08a9279b50cebaf694a2da364ee59ecf76", "parents": [ "f19a33a0704d0e605c0a5206fe5df3ab7dbf6864", "dbf8c17bd20c3c5b4ba99242afa8b714841914d1" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Fri Jan 15 21:02:29 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 15 21:02:29 2016 +0000" }, "message": "Merge \"Make the appropriate cast to protect from mingw.\"\nam: dbf8c17bd2\n\n* commit \u0027dbf8c17bd20c3c5b4ba99242afa8b714841914d1\u0027:\n Make the appropriate cast to protect from mingw.\n" }, { "commit": "ed811eeaea83453df91fa564287cd2f1b7cb705f", "tree": "cdb34fd8c9a3e3b8eb1efb8e1f05f43f7dc945dd", "parents": [ "d736cba6e7f93a2e6df172a644e413f27a1dc939" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Fri Jan 15 12:16:06 2016 -0800" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Fri Jan 15 12:16:06 2016 -0800" }, "message": "Make the appropriate cast to protect from mingw.\n\nAs the comment at the top of the file says:\n\n STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum\n value, so a cast is necessary.\n\nBug: http://b/26523949\nChange-Id: I9d86cafdc47bbb9ce0e967cdde9315babc083432\n" }, { "commit": "3b1b68d6c764a4f60d034e57a94879b7df65fd43", "tree": "6f478d0afc03ca5aae4928eda211a9a4baa81e3a", "parents": [ "cc5061f73e8acde4e91b34187f41bdd131cf85ec" ], "author": { "name": "Matt Sarett", "email": "msarett@google.com", "time": "Mon Dec 14 13:08:33 2015 -0500" }, "committer": { "name": "Matt Sarett", "email": "msarett@google.com", "time": "Thu Jan 07 18:17:33 2016 +0000" }, "message": "Allow ninepatches to be encoded using non-RGBA modes\n\nThe original intention for forcing ninepatches to be encoded as\nRGBA (with alpha) was to avoid the possibility of the decoder\nproducing 565 output.\n\n565 output is bad for ninepatches because dithering tiny images\nthat we intend to scale later leads to bad results. I would\nargue that, since the new BitmapFactory does not dither, we might\nnow be ok to allow 565 decodes for ninepatches. However, we\nwill maintain the old behavior by disabling 565 decodes for\nninepatch.\n\nThere are two changes to PNG encodings:\n(1) Allows ninepatch images to be encoded in any mode. Forcing\n them to RGBA makes things awkward for the decoder. Currently,\n BitmapFactory\u0027s png decoder checks every pixel for alpha.\n That way, RGBA images that are actually opaque can be marked\n as opaque, in order to optimize drawing. We want to remove\n this complexity from the decoder.\n(2) Make sure ninepatch chunks are stored in the png header. That\n way we know immediately that the png is a ninepatch, and can\n refuse to decode to 565 (if we feel this is best).\n\nChange-Id: I724f5dbefb1be7b412f9b362dff83cbc0603f0bf\n" }, { "commit": "087e0fcba687bce677f39fd2b708a9cbb1defcd0", "tree": "a2e894ed821b9e5afdabb45786715d80e368a50a", "parents": [ "6e49caeaabeb852f0b6cd1e75d9871bc6b70b981", "1f7a36b8e6aa55dcb22a63c250fb318260ac349f" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Dec 16 23:44:25 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 16 23:44:25 2015 +0000" }, "message": "DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 am: 40d1ab91d2 am: 8c9209183f am: 7f5ad22330\nam: 1f7a36b8e6\n\n* commit \u00271f7a36b8e6aa55dcb22a63c250fb318260ac349f\u0027:\n DO NOT MERGE: AAPT: Dump uses-permission-sdk-23\n" }, { "commit": "b2c51556382acd3981e5a6380e2fb3d85c2f68a5", "tree": "38c2bedf474a02362bed4a0cc682918bad38ad15", "parents": [ "69c5e7143dd308e8db9b6055b428b7ad3964c1ff" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Dec 02 15:40:19 2015 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Dec 16 22:43:07 2015 +0000" }, "message": "DO NOT MERGE: AAPT: Dump uses-permission-sdk-23\n\nInclude \u003cuses-permission-sdk-23\u003e permissions in dump badging and dump permissions.\n\nThis will also add implied features for that permission, marked as -sdk-23 features.\n\nEx:\n\nuses-permission: name\u003d\u0027android.permission.ACCESS_FINE_LOCATION\u0027\nuses-permission-sdk-23: name\u003d\u0027android.permission.CAMERA\u0027\n\nfeature-group: label\u003d\u0027\u0027\n uses-feature: name\u003d\u0027android.hardware.location\u0027\n uses-implied-feature: name\u003d\u0027android.hardware.location\u0027 reason\u003d\u0027...\u0027\n uses-feature-sdk-23: name\u003d\u0027android.hardware.camera\u0027\n uses-implied-feature-sdk-23: name\u003d\u0027android.hardware.camera\u0027 reason\u003d\u0027...\u0027\n\nBug:24939655\nChange-Id: Ifb374696ed4760b0ba2f1cc3516f3bf08e6cb6a3\n(cherry picked from commit 5f3b2ecb3e9d27e77bd59c7b9006a6239b773944)\n" }, { "commit": "5f3b2ecb3e9d27e77bd59c7b9006a6239b773944", "tree": "add4f060388f1edc21912a03910c898cf15b145c", "parents": [ "caceb021f19015af89f138941e9665442ff6aa6a" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Dec 02 15:40:19 2015 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Dec 10 14:17:52 2015 -0800" }, "message": "AAPT: Dump uses-permission-sdk-23\n\nInclude \u003cuses-permission-sdk-23\u003e permissions in dump badging and dump permissions.\n\nThis will also add implied features for that permission, marked as -sdk-23 features.\n\nEx:\n\nuses-permission: name\u003d\u0027android.permission.ACCESS_FINE_LOCATION\u0027\nuses-permission-sdk-23: name\u003d\u0027android.permission.CAMERA\u0027\n\nfeature-group: label\u003d\u0027\u0027\n uses-feature: name\u003d\u0027android.hardware.location\u0027\n uses-implied-feature: name\u003d\u0027android.hardware.location\u0027 reason\u003d\u0027...\u0027\n uses-feature-sdk-23: name\u003d\u0027android.hardware.camera\u0027\n uses-implied-feature-sdk-23: name\u003d\u0027android.hardware.camera\u0027 reason\u003d\u0027...\u0027\n\nBug:24939655\nChange-Id: Ifb374696ed4760b0ba2f1cc3516f3bf08e6cb6a3\n" }, { "commit": "78713998f94a2cc2562aa0ae7761bbc563d8eafa", "tree": "753a994b7373774fafa2c4258cc9c53afa845c29", "parents": [ "5f986095bed776c119d2f5452e0afeac3a437ea2" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Dec 07 14:02:15 2015 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Dec 07 14:52:53 2015 -0800" }, "message": "Specify private resource package in Android.mk\n\nPrivate resource package shouldn\u0027t be buried in some resource file.\nIt can now be specified on the command line via the Android.mk file.\n\nChange-Id: I9e3cb0bf54830d6b021077af271913306c024701\n" } ], "next": "43aecc85e85c46f457764eea22cca42b7ee912d1" }