)]}' { "log": [ { "commit": "437b8c95a803736a8917bd2b89c5653ba48976b6", "tree": "ced0844dd0c946b2e05ad1a09b199888fd67ef97", "parents": [ "3590533125d0f352104f2b0c739ee7ffffc89d0b", "39ad1b92fa808c5a4f67cc50d72531ad6ad8fdb5" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Sat Oct 08 22:03:56 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Oct 08 22:03:56 2016 +0000" }, "message": "Merge \"Rely on the platform -std default.\" am: 66f15cc01b am: 5a989a504a\nam: 39ad1b92fa\n\nChange-Id: Iec4bca8e96c776d61c5da5540a74acc6773c2bce\n" }, { "commit": "c08e32e0beb52400e3957f03429b83bbee1832de", "tree": "cf13fdbc53e7155db98b0ee36ad8c985fa0a96f1", "parents": [ "f12c6e4f5e0eecef53a75b6f3eb323018ff2ec7c" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Oct 07 15:57:17 2016 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Oct 07 15:57:17 2016 -0700" }, "message": "Rely on the platform -std default.\n\nBug: http://b/32019064\nTest: builds\nChange-Id: I7180f1eb539ff8cbe33832d010775f053a922946\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": "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": "7f56759cfdff926234c26c14d9a9f69f732179e4", "tree": "a58f4f92984ab8525052eebe4287b1aee0ae3402", "parents": [ "ae53cef574564eadf6c09e4320f91334fc349e42", "43158773b469c2d5b23e52998d0afba9a4b34323" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Sep 22 04:55:13 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 22 04:55:13 2016 +0000" }, "message": "AAPT: Don\u0027t imply specific location hardware for dump badging\nam: 43158773b4\n\nChange-Id: Ie34566a33dfbaf92f4a47f36be6786157d504066\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": "dccfd4394e1092162f7f82c437907537cdb18a5b", "tree": "5692c3e50424f1497740660c6da0e80ba6044cd2", "parents": [ "f3b99524ca451b511d8d1b9d4bb85b069a2cd516", "b7a673ed950d639eec29c7fcef6d5b6cb14f4c5b" ], "author": { "name": "Winson", "email": "winsonc@google.com", "time": "Tue Sep 20 23:14:42 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 20 23:14:42 2016 +0000" }, "message": "Removing private system ui flags from status bar flags logic. am: ab216609f1\nam: b7a673ed95\n\nChange-Id: I031135c21838f5737367f18e2b5ac247162ab455\n" }, { "commit": "ab216609f1608e61827d955fcc9fd0560bc52e4d", "tree": "8c998e9a39aa740d63c814d11f2bd4f24988c757", "parents": [ "a4fab41e8b24fd4129cec1f1c4c7c03bfe404f0a" ], "author": { "name": "Winson", "email": "winsonc@google.com", "time": "Tue Aug 09 14:05:20 2016 -0700" }, "committer": { "name": "Winson", "email": "winsonc@google.com", "time": "Mon Sep 19 18:39:25 2016 -0700" }, "message": "Removing private system ui flags from status bar flags logic.\n\n- Prevent third party apps from inadvertently changing internal SystemUI\n flags through a call to setSystemUiVisibility(). These flags are only\n set in the individual SystemUI components and can be updated in WMS\n directly.\n\nBug: 29875297\nChange-Id: I5ea238c8fb16a0eccd6e993d95a912acb359cee6" }, { "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": "48818fa81101150ed9834d1748b548cff506456b", "tree": "3261c0a25a213817ed38225bb98bc6fe7f203f50", "parents": [ "3d79f5625fd393b150810f9de9aa10a752d626f0", "55768028fd2c28e18d77eaab1cc5fe39cf891f24" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Thu Sep 08 21:19:24 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 08 21:19:24 2016 +0000" }, "message": "Change density for the correct user am: df3a7cab8f\nam: 55768028fd\n\nChange-Id: I7d4eff0c732f0e3e83adc0044ab7ab015da74993\n" }, { "commit": "df3a7cab8f534584bcef83e222372e1be9be12c5", "tree": "5b6d8bdbaac79157728cec29e84d7c0b4782cfcf", "parents": [ "a2153e6246138d303fe824d99aadf28886767743" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Tue Sep 06 17:13:41 2016 -0400" }, "committer": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Tue Sep 06 17:13:41 2016 -0400" }, "message": "Change density for the correct user\n\nBug: 30839993\nChange-Id: I5368accddfc4a03b8025a257b4155fcdc6197f11\n" }, { "commit": "818b7218c5bbe21aaa043fc58b7472ad75e90fc7", "tree": "678c330fe49f1817c9c86e845ebbc9d61c72e0fc", "parents": [ "66db34fbe25ad1759c27af2ecc721e24adcf62ca", "8673e303a73dc3b5bc6c3b095b0f29cbbac859df" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri Aug 26 23:40:04 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 26 23:40:04 2016 +0000" }, "message": "DO NOT MERGE -- Only use saved surface if started by launcher or moved to front am: 813be138ae am: 9f92bc2602\nam: 8673e303a7\n\nChange-Id: I34d205de8f368df05e068548a69448da397d2e41\n" }, { "commit": "9f92bc2602204562bc6d241b8c16c7349721a1c0", "tree": "e27b11f311dfbaa4b372d5c3d09748446877732f", "parents": [ "efc1c4d50104e9b9a7581c9b60703727805897f0", "813be138ae6f1fbe60a9efc082a30e7d25d03f7e" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri Aug 26 23:28:17 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 26 23:28:17 2016 +0000" }, "message": "DO NOT MERGE -- Only use saved surface if started by launcher or moved to front\nam: 813be138ae\n\nChange-Id: Id64071882a0b90212b92234a4d0bdc67f2ee5e1a\n" }, { "commit": "813be138ae6f1fbe60a9efc082a30e7d25d03f7e", "tree": "ce64115971ffd12746e16af065c03344f2891270", "parents": [ "d6a64d788bfa9d9e5c765fe62ce105525aed3898" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Thu Aug 25 12:12:33 2016 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri Aug 26 15:41:58 2016 -0700" }, "message": "DO NOT MERGE -- Only use saved surface if started by launcher or moved to front\n\nRestrict saved surface to launcher start (ACTION_MAIN\u0026CATEGORY_\nLAUNCHER), or there is no intent at all (eg. task being brought to\nfront). If the intent is something else, likely the app is going\nto show some specific page or view, instead of what\u0027s left last time.\n\nThis solves problems like the launcher shortcuts on DeckClock,\neach of them is a different intent and will show one specific\nview regardless of last states. Another example is Chrome tab\nopened directly by action VIEW to open some URL.\n\n(Note that this doesn\u0027t solve the problem with Chrome homescreen\nshortcuts, it will still start with saved surface (if Chrome\nis already open). This is because the shortcut is a trampoline\nactivity that starts the real chrome tab activity, but when\nthe trampoline is started, the whole task is already brought\nto front, and ChromeTab could become visible with the task\nbefore we actually start it.)\n\nbug: 31055479\nbug: 27747315\n\nChange-Id: Id3e61c61ef516b0edc1f174320f02661222f226b\n(cherry picked from commit ad24f96def42016049de05220593aa049b136def)\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": "2cc64692ceb30f171e4554eac0b69c9a8257fe3d", "tree": "6055270529eb50a2d6faaec1d036ffe081b86f18", "parents": [ "2d484bab6137618bcdedadae1e92e721c4e9e5f8", "1657493c22ec6ed460d9e082ee52653f00baec62" ], "author": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Thu Aug 25 20:31:31 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 25 20:31:31 2016 +0000" }, "message": "Merge changes from topic \u0027utf\u0027 am: 0a357a1a73 am: de8a6a66f6\nam: 1657493c22\n\nChange-Id: Ie675738a4f9042929d1ffb5e1ffcc7bbb5c7b217\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": "8f7b8a1f6c5808ea205bfb3294a313e2bcaedf7f", "tree": "9ed3dfd1f059e1b87dc169a27159224eeda82c55", "parents": [ "e71ecb2c4df15f727f51a0e1b65459f071853e35" ], "author": { "name": "Sergio Giro", "email": "sgiro@google.com", "time": "Thu Jul 21 14:44:07 2016 +0100" }, "committer": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Thu Aug 25 12:04:40 2016 +0200" }, "message": "Unicode: specify destination length in utf8_to_utf16 methods\n\nChange-Id: I5223caa7d42f4582a982609a898a02043265c6d3\n" }, { "commit": "2ec19e2c2dbb61debcbe947dc532ab4cc5a3e366", "tree": "53228a42450e9bb98d41103d4d2173fd93e1e3bb", "parents": [ "b75288da83c915549f2750a788e1d908898f6736", "b1581dbbfde1cf0065cae867c957b7f6d1519de9" ], "author": { "name": "Raph Levien", "email": "raph@google.com", "time": "Tue Aug 23 14:53:06 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 23 14:53:06 2016 +0000" }, "message": "Update lint check to accommodate new emoji sequences am: 0790ac68bc\nam: b1581dbbfd\n\nChange-Id: I17b2989e1ee0477991705d15e0324a449da69c1a\n" }, { "commit": "0790ac68bcab55905b492f6542d2393310f14ea3", "tree": "d8cd6e37869a14675862145c567f362550ee3168", "parents": [ "a6ec65edab702915439b202b10aadfc0560108d0" ], "author": { "name": "Raph Levien", "email": "raph@google.com", "time": "Tue Aug 09 14:28:54 2016 -0700" }, "committer": { "name": "Raph Levien", "email": "raph@google.com", "time": "Mon Aug 22 16:26:24 2016 +0000" }, "message": "Update lint check to accommodate new emoji sequences\n\nThese are not yet ready for updating in the unicode data, so we patch\nthem in code until they are.\n\nBug: 30594617\nChange-Id: Ib4c8568aa4840341474eb0c0c95674d640473f4d\n(cherry picked from commit 2b8b819fee939c1bca6347a74b42272bc7008fd5)\n" }, { "commit": "f238f6a186e2f2d405e5fafa65c8e520565d704d", "tree": "c364f299f6d34c3adb666c4a1bdeed0345841622", "parents": [ "763bba194991d12f6e993190ffbcb11a9c907892", "1062853800b4e79132665adbad2cfc8f5bfffa3e" ], "author": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Fri Aug 19 22:48:15 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 19 22:48:15 2016 +0000" }, "message": "Re-enable disabled emoji tests [DO NOT MERGE] am: 8cd1b1ba80\nam: 1062853800\n\nChange-Id: Ie4c1a28f0a37af3fbbce3a8611c1ab5eec79d556\n" }, { "commit": "f24170aae4b84f5bf1347ecdcd601a8e65343779", "tree": "2e609b7d0e558fb6c733542e752462b99b603b07", "parents": [ "364b59f1e5b10fa3b318e8f104e892fb364cf051", "21e026bb7eb4fa9b37867599e23b4296073072b2" ], "author": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Fri Aug 19 22:46:54 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 19 22:46:54 2016 +0000" }, "message": "Check defaults for Android default-emoji characters [DO NOT MERGE] am: 84b1746130\nam: 21e026bb7e\n\nChange-Id: Ia77312e78e70bd17147d0ef841b6ea551a12ae82\n" }, { "commit": "1062853800b4e79132665adbad2cfc8f5bfffa3e", "tree": "4860d1113857a9b1cba16592a704251a97d3606d", "parents": [ "d78d0c86da9a5b81af723bcdc98b43f0f1be0046", "8cd1b1ba8018507e4f66b64fa9f81279cb5b71a8" ], "author": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Fri Aug 19 22:27:50 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 19 22:27:50 2016 +0000" }, "message": "Re-enable disabled emoji tests [DO NOT MERGE]\nam: 8cd1b1ba80\n\nChange-Id: I0cc4e1b30d8df95efea682d0b2ae4dc96822689b\n" }, { "commit": "21e026bb7eb4fa9b37867599e23b4296073072b2", "tree": "42dacceeceea739827a7eb0880b8e1c0b161f76e", "parents": [ "491f31c8f6fc6c5fb5daba41ea5abd1ea60ee840", "84b1746130c0df855414dc8c39f4fe5f180b0c11" ], "author": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Fri Aug 19 22:26:11 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 19 22:26:11 2016 +0000" }, "message": "Check defaults for Android default-emoji characters [DO NOT MERGE]\nam: 84b1746130\n\nChange-Id: Icadd25ab3dc99a2ce00220900a6b37cf0144d7d4\n" }, { "commit": "eab8a128457edd2196bb2c4fa9040c9194511b96", "tree": "22bdc2d35186bf553a705970309a2d3eeb23532d", "parents": [ "01bb4064267d94ca49e8c4a4633a75c755286588", "8cd1b1ba8018507e4f66b64fa9f81279cb5b71a8" ], "author": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Fri Aug 19 21:43:01 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 19 21:43:06 2016 +0000" }, "message": "Merge \"Re-enable disabled emoji tests [DO NOT MERGE]\" into nyc-mr1-dev" }, { "commit": "01bb4064267d94ca49e8c4a4633a75c755286588", "tree": "f569a8499e573d4bd1c6b7bb4248b06be4bf6362", "parents": [ "f4c5b344ae0845a80a05bd0a97906170fc552956", "84b1746130c0df855414dc8c39f4fe5f180b0c11" ], "author": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Fri Aug 19 21:43:01 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 19 21:43:06 2016 +0000" }, "message": "Merge \"Check defaults for Android default-emoji characters [DO NOT MERGE]\" into nyc-mr1-dev" }, { "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": "bd070b7792b7ff3d2783c1621cf255f39223837c", "tree": "cdcb86bf59a60841a675f74fb3045c97554a3c33", "parents": [ "442e9a6bcf3505abbda69cbf2f4245fb4760ba97", "1ab51f37699de9c34e655bd2795d6fd3eccfe98b" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Tue Aug 16 02:39:40 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 16 02:39:40 2016 +0000" }, "message": "Merge \"Fix google-explicit-constructor warnings.\" am: ea537bf5b3 am: 9c0b881c9d\nam: 1ab51f3769\n\nChange-Id: Ide274953e85d1ba9e0e978a531d69c3543e7923a\n" }, { "commit": "1ab51f37699de9c34e655bd2795d6fd3eccfe98b", "tree": "b8f42e6f1812753a7748e8a825e3ac57154d8595", "parents": [ "c9107e326389ce9ede59792e9abc7d6407608b82", "9c0b881c9d6b9705ed3328e10726aa1e2e24a449" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Tue Aug 16 02:31:42 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 16 02:31:42 2016 +0000" }, "message": "Merge \"Fix google-explicit-constructor warnings.\" am: ea537bf5b3\nam: 9c0b881c9d\n\nChange-Id: If4ec2ed4609d130e2b25dae2bf90f2209878cd4c\n" }, { "commit": "9c0b881c9d6b9705ed3328e10726aa1e2e24a449", "tree": "d40fd1b744b250a1b571770b70ded43b461662b3", "parents": [ "2f4c6e3d0d671ec08945bdf21b3a5faa388a22d9", "ea537bf5b3d1dacc2fc904e238ee4e15aeb0d707" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Tue Aug 16 02:23:48 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 16 02:23:48 2016 +0000" }, "message": "Merge \"Fix google-explicit-constructor warnings.\"\nam: ea537bf5b3\n\nChange-Id: I38d1f635b7bf2c46648c852bf0caa421e67218f4\n" }, { "commit": "ea537bf5b3d1dacc2fc904e238ee4e15aeb0d707", "tree": "e51c74b8ae05f96a9f9576cb168eca0edc593800", "parents": [ "96660b37a1a3abdaaac8b1331eb7ca9095ccd639", "21c0f29597a80016a630b81676169dabfa3dc18f" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 16 02:12:38 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Aug 16 02:12:39 2016 +0000" }, "message": "Merge \"Fix google-explicit-constructor warnings.\"" }, { "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": "21c0f29597a80016a630b81676169dabfa3dc18f", "tree": "fbcab7f8678e2fedd816e9fb65e82197476d4fa5", "parents": [ "76ce8e52422bc6121fb974ef6aab040bb5d9da51" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Mon Aug 15 14:45:02 2016 -0700" }, "committer": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Mon Aug 15 14:45:02 2016 -0700" }, "message": "Fix google-explicit-constructor warnings.\n\n* Add explicit keyword to conversion constructors.\nBug: 28341362\nTest: build with WITH_TIDY\u003d1\n\nChange-Id: I7422d703de17c4266d2a022990d0e1df40f48226\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": "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": "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": "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": "77508b9c19af256f4b27ff8cc9ebc7b2cd9e123f", "tree": "4eece9054e516cc622918cca3933c700e0784988", "parents": [ "5816e794b5e6714e723ab5a596b89af85092488e", "4ee22dd0832f1bdb9bfd70d0b740421cb1a50788" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Mon Aug 01 23:46:15 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Aug 01 23:46:15 2016 +0000" }, "message": "Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite am: 2005edf642\nam: 4ee22dd083\n\nChange-Id: I5a9006361b3ded4eaf03b1362a0dfa2aa36fdb2e\n" }, { "commit": "4ee22dd0832f1bdb9bfd70d0b740421cb1a50788", "tree": "c46865f7e500459f3009919c6b9916266fae3b40", "parents": [ "1e35cb6025ac36990fd5869f52bbd359903213f7", "2005edf64252a851cc256e71fbf99f84c9eb72ad" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Mon Aug 01 23:39:34 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Aug 01 23:39:34 2016 +0000" }, "message": "Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite\nam: 2005edf642\n\nChange-Id: I48dfa98a54a8680d091cbc403feb30bba35f2efd\n" }, { "commit": "2005edf64252a851cc256e71fbf99f84c9eb72ad", "tree": "21bedc78461b84793a9324c1b85839c1f81e3c7d", "parents": [ "8261d1e042542b7e648b0a213b313149f898c36b" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Sun Jul 31 22:48:28 2016 -0700" }, "committer": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Sun Jul 31 22:48:28 2016 -0700" }, "message": "Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite\n\nUse the same name for the static and shared libraries so that the module\ndefinitions can be shared.\n\nChange-Id: I1578ee7044689194ae1baea4d71f1b0e8737505f\n" }, { "commit": "84b1746130c0df855414dc8c39f4fe5f180b0c11", "tree": "680fc866a4e0aec74632c3d627edef664409a5ea", "parents": [ "4e00581e6b98ff59a9a1dbf2038639c395a594aa" ], "author": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Mon Jul 25 18:14:14 2016 -0700" }, "committer": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Wed Jul 27 18:10:38 2016 +0000" }, "message": "Check defaults for Android default-emoji characters [DO NOT MERGE]\n\nThere are 12 characters that Android is defaulting to emoji,\ndiffering from UTR #51 recommendation. This tests for their proper\nsupport.\n\nBug: 30379358\nChange-Id: Icd570510090ef29b3b7a3520bc368c5f77f99fa4\n(cherry picked from commit 10ea8f7431f3748be4b788100f1cab5f703284ac)\n" }, { "commit": "8cd1b1ba8018507e4f66b64fa9f81279cb5b71a8", "tree": "1eea0a670c91850961532a91cc8358a8f3add530", "parents": [ "4e00581e6b98ff59a9a1dbf2038639c395a594aa" ], "author": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Mon Jul 25 14:04:34 2016 -0700" }, "committer": { "name": "Roozbeh Pournader", "email": "roozbeh@google.com", "time": "Tue Jul 26 18:32:57 2016 -0700" }, "message": "Re-enable disabled emoji tests [DO NOT MERGE]\n\nSince I2e508ced90515409ff6882b3c98d8911094b9b86 updates the emoji\ndata to version 4.0 beta, we can now re-enable the disabled emoji\ntests.\n\nAlso fix some style issues, update data file parsing method to handle\nthe new emoji format, add UN to unsupported flags, and do a little\nrefactoring.\n\nBug: 30379358\nBug: 26187231\nChange-Id: I441fdfed68381d08e5e0b3af91e94bfae742eef6\n" }, { "commit": "b76adc511701d5069c191570066e68538bd946c3", "tree": "2e48b70e590f81704a099a9400929566d3235ee8", "parents": [ "a0450f6557909311f434b3a6d06342052e33f42e", "45e6d2dc8b8b7bd4e588368179d8d4b05fc6810c" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri Jul 22 17:17:26 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 22 17:17:26 2016 +0000" }, "message": "Clean up surfaces when app is resumed without being stopped.\nam: 45e6d2dc8b\n\nChange-Id: I9ae5c2a9c6a93246338221252cf943db6763e1c4\n" }, { "commit": "45e6d2dc8b8b7bd4e588368179d8d4b05fc6810c", "tree": "8cff45abc4af25df06fb2adb675c166c45c4aa38", "parents": [ "f8bc27d9683e4089cdfd778dcb61ae67f44665b7" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Wed Jul 20 18:33:56 2016 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Thu Jul 21 10:17:39 2016 -0700" }, "message": "Clean up surfaces when app is resumed without being stopped.\n\nWhen quickly toggling between two apps, app could be resumed while\nit\u0027s stopping but not yet stopped. Upon resuming, it could have\nsurfaces that\u0027s marked mDestroying and waiting for the stopped\nto be destroyed.\n\nWe need to dispose these surfaces properly. If the window is already\nremoved, we destroy them. Otherwise, clear mDestroying flag so that\nthe window is ready to be used again. Leaving mDestroying\u003dtrue makes\nthe window ineligible for certain things such as receiving wallpaper.\n\nbug: 30255354\nChange-Id: Id881653550595ab8e702d6950949bf202ac5a0d9\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": "a77343f87372cd65e7872cdc2d6ce0b1ebb2572d", "tree": "ba674f7a2d3887effe49efe17a32f78fd306cc7a", "parents": [ "8d3090466bebca995f6ae31cef80530e229c3b57", "2f39bc777c22b5e4efb0f2764b0e35c66cdf6257" ], "author": { "name": "Doug Felt", "email": "dougfelt@google.com", "time": "Thu Jul 14 22:30:09 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 14 22:30:09 2016 +0000" }, "message": "Merge \\\"Patch out part of the emoji tests.\\\" into nyc-mr1-dev\nam: 2f39bc777c\n\nChange-Id: I90c3528cf6d85929114af94feb0ef2f36954ca9f\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": "4970cdac7e9acc17ee75c7a1787cdc528ea9fd0f", "tree": "b950a318a98d8e06510e28028c4bef5b7cec4a84", "parents": [ "5bd9ea82d2ab79911abadc7afbdf208f79e9d160" ], "author": { "name": "Doug Felt", "email": "dougfelt@google.com", "time": "Fri Jul 08 17:42:15 2016 -0700" }, "committer": { "name": "Raph Levien", "email": "raph@google.com", "time": "Wed Jul 13 18:44:45 2016 +0000" }, "message": "Patch out part of the emoji tests.\n\nThis is temporary, until we have proper attribution for additional\nemoji data.\n\nBug: 29939737\nChange-Id: I5b97c8e055fa2ccf44b13bf801f681b860d47286\n(cherry picked from commit f874a1949a7516596a0c2f5829e140dc6f69c326)\n" }, { "commit": "ee2f46485e5bc92e46f486c0e118463ca5e6c2ca", "tree": "6524e683ab30c0f98d36b0b8a9fd8ff3a45ae4ae", "parents": [ "5b429166fc91dccc9f090402b00c27e8b0f830a9", "b4d4ce31ab92ddaf1e8ef337b5ba73ea852a2ac9" ], "author": { "name": "Zak Cohen", "email": "zakcohen@google.com", "time": "Wed Jul 13 10:22:02 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 13 10:22:02 2016 +0000" }, "message": "Merge \\\"Adds a screenshot wallpaper method to WallpaperManagerService.\\\" into nyc-mr1-dev\nam: b4d4ce31ab\n\nChange-Id: I4737e4d758335240614d2d2b51c11b8c739160fc\n" }, { "commit": "3683fb1e1d9a4f4f672e9083ae3d5e31c7034c8f", "tree": "c1b62f519ff67f0bbb07d7424d3da1e0d87a63a3", "parents": [ "0171a6ef8b45e83eabb3843a544a59f6fa581db9" ], "author": { "name": "Zak Cohen", "email": "zakcohen@google.com", "time": "Mon Jul 11 19:47:37 2016 +0100" }, "committer": { "name": "Zak Cohen", "email": "zakcohen@google.com", "time": "Tue Jul 12 17:18:36 2016 +0000" }, "message": "Adds a screenshot wallpaper method to WallpaperManagerService.\n\nBug: 29963541\n\nChange-Id: If0a574004f8bddf1ba170587a8187253fe045ef4\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": "0dbe6db0140ebaa40f265c777e5dbb9684fe60d3", "tree": "52feddc8b5d17d16b833151bc9760ccd0d1436ce", "parents": [ "db4010232e23c3f792c9979d5559571d0fa2f0fe", "30efa24b11ee7ca751d3390986a1ee682551ce0e" ], "author": { "name": "Robert Carr", "email": "racarr@google.com", "time": "Fri Jul 01 19:38:49 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 01 19:38:49 2016 +0000" }, "message": "Merge changes I38cff63b,Id3739bbc,If052cd8c into nyc-mr1-dev\nam: 30efa24b11\n\nChange-Id: I9ed6ae1f45221ff702162a1608bb8db7059058f5\n" }, { "commit": "fd10cd1989966d01011a0cf75f3282f3e12ca5a6", "tree": "fb8afc89c8fa0e814e394b3e69173559ecb81b79", "parents": [ "ef5c3aad4df40913d62de4fd9b12e2c7a9bacdf5" ], "author": { "name": "Robert Carr", "email": "racarr@google.com", "time": "Wed Jun 29 16:41:50 2016 -0700" }, "committer": { "name": "Robert Carr", "email": "racarr@google.com", "time": "Fri Jul 01 11:05:40 2016 -0700" }, "message": "Force CROSSFADE rotation when launching from double tap gesture.\n\nWhen activity transition triggers a rotation change, the starting\nwindow will normally be the top window at the time we try\nto select the window animation. However, these layout params won\u0027t\nhave the apps rotation animation set (as the client code will set that\non the real window, not the starting window). Eventually we would\nlike to add API to specify rotation animation via manifest to solve\nthis problem cleanly. In the mean time, we can force a specific rotation\nanimation from the double tap gesture, and clean up some camera\nugliness. We accomplish this by attaching an animation hint to\nActivityOptions.\n\nBug: 28838855\nChange-Id: If052cd8cbae76651da43f3b4c590cd9dcc1afc0f\n" }, { "commit": "d02470f5a89a4e4a94dda371ab472e9cedd1130d", "tree": "5978c18edcb28d383a877debcaf482da3df668c9", "parents": [ "d630384cf38e3aa805259f4f62dbbf1f971455a3", "dc42d7dd135460701435a8f925eae9c7b47d14ba" ], "author": { "name": "Yohei Yukawa", "email": "yukawa@google.com", "time": "Thu Jun 23 01:29:58 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 23 01:29:58 2016 +0000" }, "message": "Merge \\\"Add InputMethodService#exposeContent()\\\" into nyc-mr1-dev\nam: dc42d7dd13\n\nChange-Id: Icf3ca0403c7dee26a3083ca98ca1239887d471bc\n" }, { "commit": "dc42d7dd135460701435a8f925eae9c7b47d14ba", "tree": "3c136369d935f5acaa3eec5181f735538ac83660", "parents": [ "2b0b1e5a942338576bba059145d3012c7a141c1b", "25e0813e6eb6315b1016db805fa9b791b4ae5cc2" ], "author": { "name": "Yohei Yukawa", "email": "yukawa@google.com", "time": "Thu Jun 23 01:25:36 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 23 01:25:39 2016 +0000" }, "message": "Merge \"Add InputMethodService#exposeContent()\" into nyc-mr1-dev" }, { "commit": "25e0813e6eb6315b1016db805fa9b791b4ae5cc2", "tree": "48d143522b5480f0cbeb3b2e3fbefe91aee0dca0", "parents": [ "f0823858e502d36c01a39afd1fc9384a1fe9a3f7" ], "author": { "name": "Yohei Yukawa", "email": "yukawa@google.com", "time": "Wed Jun 22 16:31:41 2016 -0700" }, "committer": { "name": "Yohei Yukawa", "email": "yukawa@google.com", "time": "Wed Jun 22 16:31:41 2016 -0700" }, "message": "Add InputMethodService#exposeContent()\n\nThis is a follow up CL to my previous CLs [1][2] that introduced\nInputConnection#commitContent(InputContentInfo, Bundle) API to enable\nIMEs to send a content to the target application.\n\nWith this CL, IME developers are able to temporarily expose\nInputContentInfo object to the target package without permanently\ngranting URI permission. Although calling IMS#exposeContent() is\nallowed only for the IME that is currently selected, the client is able\nto request a temporary read-only access even after the current IME is\nswitched to any other IME as long as the client keeps InputContentInfo\nobject.\n\nHere is a sample code snippet about how to use this mechanism.\n\n [IME]\n InputContentInfo contentInfo \u003d new InputContentInfo(\n contentUri,\n new ClipDescription(description, new String[]{mimeType}),\n linkUrl);\n exposeContent(contentInfo, getCurrentInputEditorInfo());\n getCurrentInputConnection().commitContent(inputContentInfo, null);\n\n [App]\n try {\n contentInfo.requestPermission();\n // Load inputContentInfo.getContentUri() here.\n } finally {\n contentInfo.releasePermission();\n }\n\n [1]: Iaadf934a997ffcd6000a516cc3c1873db56e60ad\n 152944f4909c47917473293b258d266435c6ab35\n [2]: Ica1ba3154795c1bf44e140dfe639b299f83cd8af\n adebb52588b098a1af678d4e33a234ef1ce783b2\n\nBug: 29450031\nChange-Id: I2772889ca01f2ecb2cdeed4e04a9319bdf7bc5a6\n" }, { "commit": "c8aa7f98c1246eaf4558407f1608eded7c5f3496", "tree": "d1d977927658307f22ce6ce5d5e1d96c741376a6", "parents": [ "8a24cfb05583430ab4767e74de8459b9e319cc65", "e0dc709ac8ddd974f618ed31ab2a2d24aff10b2d" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Jun 22 22:47:39 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 22:47:39 2016 +0000" }, "message": "Merge \\\\\"Fix build due to missing abstract method impl\\\\\" into nyc-dev am: aeef7c4748\nam: e0dc709ac8\n\nChange-Id: I2360c6d049352c4e32f33096d3f659d636941417\n" }, { "commit": "a34b917ce0d63ec868607fbe25c166116dee94c8", "tree": "ad9e2c5c752d9d594477fdeae0f5fe0f746ffd32", "parents": [ "1f358b11aec349627bb5afe3a5dd8f598489935e", "aeef7c47487e5aafa68563399e9a9088d01fa04c" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Jun 22 22:41:52 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 22:41:52 2016 +0000" }, "message": "Merge \\\"Fix build due to missing abstract method impl\\\" into nyc-dev\nam: aeef7c4748\n\nChange-Id: I9d12601b4db0108f313c1a69ada67c92929f548b\n" }, { "commit": "e0dc709ac8ddd974f618ed31ab2a2d24aff10b2d", "tree": "9dd94524d187611cacf49d02686fd123ffcf7365", "parents": [ "9d2a3188fabbcc8c1c8d334f34f2e1c73b943a27", "aeef7c47487e5aafa68563399e9a9088d01fa04c" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Jun 22 22:41:38 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 22:41:38 2016 +0000" }, "message": "Merge \\\"Fix build due to missing abstract method impl\\\" into nyc-dev\nam: aeef7c4748\n\nChange-Id: I38fc7c88e9c4ea5abf50a0bec5f2302c4622605f\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": "0f5caab5762d9ace8e7d87e29296bcb8fdfe9b4b", "tree": "6c532bce9536aa994fcfb52e3f9d536dd6c0ce74", "parents": [ "0bf31c3fa6263f595022d8f3addfd4d28f70db99" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Jun 22 13:11:40 2016 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Jun 22 13:11:40 2016 -0700" }, "message": "Fix build due to missing abstract method impl\n\ngetDisplay() was added to Context, which needs to be implemented\nfor BridgeContext.\n\nBug:28388969\nChange-Id: I7b0ffcbbe252403e35f08d3fa40d6b0e4dbf0daa\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": "11e3bf5d30fd4e9eea1fd8de352d4d29ccb1fbd3", "tree": "25a09f9a72b0009fb5ebe7103dcb18a3a4c62105", "parents": [ "ada74feaccafe706ea3f5af94e4d2f4901e6cf8d", "3d808710326da8ad6e8ea79de908691906486abc" ], "author": { "name": "Yorke Lee", "email": "yorkelee@google.com", "time": "Thu Jun 16 21:27:50 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 16 21:27:50 2016 +0000" }, "message": "Merge \\\\\"Limit global drags to apps targeting SDK 24 and above\\\\\" into nyc-dev am: f33af2285b\nam: 3d80871032\n\nChange-Id: I2f7745317f6ae0932d7c16469b500847e465a912\n" }, { "commit": "3d808710326da8ad6e8ea79de908691906486abc", "tree": "2d4dade7d200dff3b0eb97c9adfba2e57c199438", "parents": [ "b7181150c42da5d5edcf45fad84e8a7fb2be462b", "f33af2285b74ff7f092149ee86ec687a892aa600" ], "author": { "name": "Yorke Lee", "email": "yorkelee@google.com", "time": "Thu Jun 16 21:22:22 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 16 21:22:22 2016 +0000" }, "message": "Merge \\\"Limit global drags to apps targeting SDK 24 and above\\\" into nyc-dev\nam: f33af2285b\n\nChange-Id: I539f39cfea50f34dade2141829b21d422809b09f\n" }, { "commit": "599cf6bc4a129a76dccd74713f7d3deb5fdc50f2", "tree": "f93152873507553f3f8fd5382e21be0acafd0d53", "parents": [ "0bae4dcd76d4138ca9ec9d0b0e9960705e54650d", "f33af2285b74ff7f092149ee86ec687a892aa600" ], "author": { "name": "Yorke Lee", "email": "yorkelee@google.com", "time": "Thu Jun 16 21:21:57 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 16 21:21:57 2016 +0000" }, "message": "Merge \\\"Limit global drags to apps targeting SDK 24 and above\\\" into nyc-dev\nam: f33af2285b\n\nChange-Id: If4d9abfb81929f8366fc9acc7978816d55117fbc\n" }, { "commit": "0e8524719559f0be9c8145dbf9f52100e1fb60c3", "tree": "0752fd23eb79a109cf4aa5745a70a64e80b2f13d", "parents": [ "32d67fab83d96a9c05d03a44fcb44e0410bb61df" ], "author": { "name": "Yorke Lee", "email": "yorkelee@google.com", "time": "Wed Jun 15 10:03:18 2016 -0700" }, "committer": { "name": "Yorke Lee", "email": "yorkelee@google.com", "time": "Thu Jun 16 09:35:40 2016 -0700" }, "message": "Limit global drags to apps targeting SDK 24 and above\n\nBug: 29127791\n\nChange-Id: Ib5f85a207bdb79eeac0418fda78e452d225761bc\n" }, { "commit": "b80680af787dfb27e5a4b1b0edae8502373c4935", "tree": "47d3bd8196f8d90ae821a6ba17b386a51954b5c2", "parents": [ "0f4ae5e1a6600763a6ac0180b4bde7e20b041a97", "c878fb0cb8a901aae71d965a57e75e682eb6f67f" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Jun 03 00:38:23 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 03 00:38:23 2016 +0000" }, "message": "Merge \"Allow uses-library under \u003capplication\u003e\" into nyc-mr1-dev\nam: c878fb0cb8\n\n* commit \u0027c878fb0cb8a901aae71d965a57e75e682eb6f67f\u0027:\n Allow uses-library under \u003capplication\u003e\n\nChange-Id: Iaa1f6acb21ec2426a9b8e935efd71cd877bed667\n" }, { "commit": "fee32d4d5f281504d3cc319e9833853ae0b23263", "tree": "1482e7ebc120d90642c898d8a0e9109bcdad8022", "parents": [ "0f19009fb7daa5e03c29f4c853e3798b4f38661e" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue May 31 15:07:20 2016 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Jun 02 23:57:55 2016 +0000" }, "message": "Allow uses-library under \u003capplication\u003e\n\nBug:29106952\nChange-Id: I2e780323d86e7050038d34426a30e66a4bbfcc23\n" }, { "commit": "5e2de2eb1221c9dafd260b42c732417cfc2b074f", "tree": "ab84ab293b83f5655d9ea8857039c11d7aff5183", "parents": [ "2753194ca89ec9da399b703e49d7455e2ee3639d", "9bb16a480d00d8016f9c1969e136acfecceb802b" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Wed May 25 16:51:19 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 25 16:51:19 2016 +0000" }, "message": "Merge \"Use ICU\\\u0027s Calendar class in date picker \u0026 related classes\" into nyc-dev am: cfbca5640c\nam: 9bb16a480d\n\n* commit \u00279bb16a480d00d8016f9c1969e136acfecceb802b\u0027:\n Workaround to display menus for AppCompat themes\n\nChange-Id: I6fee3d4348e763f1e590b6e49740f3108b702b4e\n" }, { "commit": "9bb16a480d00d8016f9c1969e136acfecceb802b", "tree": "4b159073528a1d5ae29901f04f7509f006f19691", "parents": [ "ffa81d044064281a0f79a214f7cd57a37ff20c88", "36cd747bb6030c9c19dbab6bdfd85b2106017973" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Wed May 25 16:47:47 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 25 16:47:47 2016 +0000" }, "message": "Merge \"Workaround to display menus for AppCompat themes\" into nyc-dev\nam: 36cd747bb6\n\n* commit \u002736cd747bb6030c9c19dbab6bdfd85b2106017973\u0027:\n Workaround to display menus for AppCompat themes\n\nChange-Id: I5af2f38a8c470c5aca89e91b951c45f7ae91ed3b\n" }, { "commit": "6cc742643967796622c0747311ab3b204a39393a", "tree": "da01e244e25d35e9a6524c3624717de7df80cc87", "parents": [ "b9878f0c5aab4b540180fb7e36a8e0b41b5e50c2", "36cd747bb6030c9c19dbab6bdfd85b2106017973" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Wed May 25 16:47:14 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 25 16:47:14 2016 +0000" }, "message": "Merge \"Workaround to display menus for AppCompat themes\" into nyc-dev\nam: 36cd747bb6\n\n* commit \u002736cd747bb6030c9c19dbab6bdfd85b2106017973\u0027:\n Workaround to display menus for AppCompat themes\n\nChange-Id: I65ce3798aa3fc2d851126d88b3dc1834d05b5393\n" }, { "commit": "790e5f6c1cab43fb377d86d3c9189a509b28b217", "tree": "8ba1fd030d080c709421a9c01bf3abe676731689", "parents": [ "cb988096570de8af4883ae3bdea06c88f8fd235a" ], "author": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Tue May 24 14:40:34 2016 +0100" }, "committer": { "name": "Diego Perez", "email": "diegoperez@google.com", "time": "Tue May 24 18:27:35 2016 +0100" }, "message": "Workaround to display menus for AppCompat themes\n\nLayoutlib currently does not implement menus for the support Toolbar.\nWhen it detects that an AppCompat theme is being used, it will try to\nuse by default the support Toolbar which breaks the display of menus.\nThis works around the problem by forcing layoutlib\nto use the framework toolbar in menu previews (regular activities\nwon\u0027t display the menu if they use AppCompat).\n\nBug: http://b.android.com/210946\nChange-Id: Ic1d162c6d74119ef42895776c3bc3851a9549120\n" }, { "commit": "032dcff2012e1b60848b5834bfdcacf432021207", "tree": "7b3eb929d207f99925243c88a8f3286addfb09bf", "parents": [ "5905c14a5940c63af7098d971e8b0f5768728488", "d5bb8487d58b168543d6504504d8e89e062a6b8b" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Thu May 19 23:39:59 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 19 23:39:59 2016 +0000" }, "message": "Merge \"Fix misc-macro-parentheses warnings in aapt and androidfw.\" am: 6f4b566169 am: f55c9f7aa6\nam: d5bb8487d5\n\n* commit \u0027d5bb8487d58b168543d6504504d8e89e062a6b8b\u0027:\n Fix misc-macro-parentheses warnings in aapt and androidfw.\n\nChange-Id: I779a9fe55406d460cedc1279e3c056e74787c5bb\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" } ], "next": "f5a87d86bf08b564d2db00bf626092721e348e61" }