)]}' { "log": [ { "commit": "84d4917c7560da364eb8fe79353e046807beb416", "tree": "209739704a79f211773a4ed6f08f78724cbe6bcc", "parents": [ "cd3f875321a30f9cc21e631fa85f7fb12901b147", "12cf0f9c4cf8e6aed738da7349f556bd716ec09e" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Aug 17 21:15:40 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 17 21:15:40 2015 +0000" }, "message": "am 12cf0f9c: am eba23aaa: Merge \"Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.\"\n\n* commit \u002712cf0f9c4cf8e6aed738da7349f556bd716ec09e\u0027:\n Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.\n" }, { "commit": "e17788ceff5c676f3783e5aa25d57a613e9f59db", "tree": "5c02145f2500a7c1021415980ab28706b6a0bffb", "parents": [ "e3f0a881c20072a644317330ecf7409c81e96888" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Aug 17 12:41:46 2015 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Aug 17 12:41:46 2015 -0700" }, "message": "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.\n\nChange-Id: Ideef62acbf53a442167c9b8038021affffef9e8a\n" }, { "commit": "f473084a4a71c3e1c1f58db36b3934540f89c9e6", "tree": "c0206d0f80de97e12f0ad8d9824f6060105f3c60", "parents": [ "d61da065605e5193b9caa3c709e6a23f46f26b2c", "6df21b51b118281a46cfd3c13716718040a33aea" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Sun Aug 16 02:54:54 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Aug 16 02:54:54 2015 +0000" }, "message": "am 6df21b51: am 085a6b42: am 89a3c5ad: am 0cd143ad: Merge \"AAPT: Fix regression in resource versioning\" into mnc-dev\n\n* commit \u00276df21b51b118281a46cfd3c13716718040a33aea\u0027:\n AAPT: Fix regression in resource versioning\n" }, { "commit": "beb9e33bfb79847c25aac98e39f3ea620a953ef7", "tree": "4f795b9e4b2cdf95f1dd6b43fdf02eb9fc438b0e", "parents": [ "81eeef589386483722c21572d9ab6d3f95dd26be" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 14 13:16:18 2015 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Aug 14 13:41:46 2015 -0700" }, "message": "AAPT: Fix regression in resource versioning\n\nWith a set of resources with the following configurations:\n\n()\n(land)\n\nthe regression caused any resources that needed to be versioned in configuration () to be lost.\n\nBug:23038206\nChange-Id: I2f1b0313fb780ac241e7aaa487cb37dfb79c36aa\n" }, { "commit": "344d347af22705aa2fa80602d27a5682a72b5f69", "tree": "fbc2631fbd76ca57dd26558c5ff9b8a4c4b22218", "parents": [ "d202d15d9e4845537c4409c9880eb269b2b59129", "39669d7f6b8fedef3468ab3d417c93a21df528af" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Aug 12 23:28:30 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 12 23:28:30 2015 +0000" }, "message": "am 39669d7f: am 6fdc6333: Merge \"Lose HAVE_ANDROID_OS from frameworks/base.\"\n\n* commit \u002739669d7f6b8fedef3468ab3d417c93a21df528af\u0027:\n Lose HAVE_ANDROID_OS from frameworks/base.\n" }, { "commit": "ba3fe56edc1da4dad0d831a1892e7b1c3c20c437", "tree": "baa26269c62707c7391b442a583968ee11bbc4c0", "parents": [ "daf8d9056815b7435bdf4d07da3f938f11052691" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Aug 12 14:49:53 2015 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Aug 12 14:49:53 2015 -0700" }, "message": "Lose HAVE_ANDROID_OS from frameworks/base.\n\nChange-Id: I713881fdbaec7cbbb5e7f2f4be6f9b8be3d2ca4e\n" }, { "commit": "a5c9d829ce9e84d4a4322fc96259ba333d41f336", "tree": "27b56812de1d986e11c793c9469ef82c0c54f872", "parents": [ "617a2d7ca7045b7acfb16541ea22a808b5d147c9", "7fa83d269b6f84ae32ddc94731a44acb6d66c4c1" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Jul 31 00:55:20 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jul 31 00:55:20 2015 +0000" }, "message": "am 7fa83d26: am b9904daa: am 15724ffc: am e3b0119f: Merge \"AAPT: Fix resource versioning\" into mnc-dev\n\n* commit \u00277fa83d269b6f84ae32ddc94731a44acb6d66c4c1\u0027:\n AAPT: Fix resource versioning\n" }, { "commit": "0e252720b2b7b6a5e7cab9dee1e8c6144a9ad662", "tree": "2d4cf0451ac36e9aca2b178c0c75579307c016e7", "parents": [ "bafb51305731fd837b12878fffabe8885239ea10", "e528f048689868a2d4dfdf23b553fe536acd15cd" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Jul 30 00:16:28 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jul 30 00:16:28 2015 +0000" }, "message": "am e528f048: am 84a04d52: Merge \"Move frameworks/base/tools/ off AndroidConfig.h.\"\n\n* commit \u0027e528f048689868a2d4dfdf23b553fe536acd15cd\u0027:\n Move frameworks/base/tools/ off AndroidConfig.h.\n" }, { "commit": "9ec96f97567bc86deebe073d5c828a6477b9a785", "tree": "0a3a9e0f94a3ab665d5cc4865c000094b7703d9c", "parents": [ "7d71d88c6d305d6ed19b320944f4ce644db82240" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Jul 29 14:35:18 2015 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Jul 29 14:35:18 2015 -0700" }, "message": "Move frameworks/base/tools/ off AndroidConfig.h.\n\nChange-Id: Ibc7abb67a56945a9618bc91ccdbebe4c806879a5\n" }, { "commit": "f45d2fad2ecd3cb3c4aeee3014763e01b59eab09", "tree": "8d483d3552a4425d7bbe013284b1dd5e8f840543", "parents": [ "beb6e66817e084c8a1ac92ecaeb6f0c73d11cc49" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Jul 28 12:10:36 2015 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Jul 28 12:26:57 2015 -0700" }, "message": "AAPT: Fix resource versioning\n\nResource generation was greedy, so when an attribute with sdk level 21 was used in a resource\nwith v1, and a different attribute with sdk level 21 was used in a resource with v11,\na v21 resource would be synthesized, but it would contain the attribute from v1 instead of v11.\n\nThis change fixes the issue, having the higher versioned resource take precedence.\n\nBug:22793816\nChange-Id: Ia687f56b0d9969e424111477d55d9804255b22e9\n" }, { "commit": "a083ef9a7b882a249928ed928adf6af61a525e37", "tree": "f96834b9ee1da4100388693e9bb407867227a1a6", "parents": [ "176df28256f2657f933235d99cf3247081b02f42", "bbcc914b18a5b2ea57e25e6e79336c5c75d49421" ], "author": { "name": "Colin Cross", "email": "ccross@google.com", "time": "Thu Jul 23 19:11:22 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jul 23 19:11:22 2015 +0000" }, "message": "am bbcc914b: am 01efd7e8: Merge \"Use build_number from file\"\n\n* commit \u0027bbcc914b18a5b2ea57e25e6e79336c5c75d49421\u0027:\n Use build_number from file\n" }, { "commit": "01efd7e820edb9677491f28af999d825f21711a4", "tree": "ea3b0a44fcd0feb57bb33dc89dcfa2147bad3b91", "parents": [ "86d5fc2874b4c17bd4f48ae307e49ba8108e11f0", "06e04f76715e05ad5a49b13f541cdebb11f41409" ], "author": { "name": "Colin Cross", "email": "ccross@google.com", "time": "Thu Jul 23 18:23:06 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jul 23 18:23:06 2015 +0000" }, "message": "Merge \"Use build_number from file\"" }, { "commit": "1c6d9005d30ef3f9cc30fb89e78751b7033a453f", "tree": "ea3a51a5eb52af1faf0e316af511f2b4a868e12d", "parents": [ "426020b80d2214e3e993140abbfe4adc7b14de81", "f9a8221810a0b5aaa4050becaa0aa9d492035ff3" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Jul 22 01:26:20 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 22 01:26:20 2015 +0000" }, "message": "am f9a82218: am 86d5fc28: Merge \"aapt: expat exports its header files now.\"\n\n* commit \u0027f9a8221810a0b5aaa4050becaa0aa9d492035ff3\u0027:\n aapt: expat exports its header files now.\n" }, { "commit": "b48adad2ede148b62c7025da4d2320cb5d9af58c", "tree": "d58d120d664686ac4836d9f018ea8166d7eef3a3", "parents": [ "79a1bde2e0f38507738743e490beb895dae7b03e" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Tue Jul 21 11:39:21 2015 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Tue Jul 21 17:25:01 2015 -0700" }, "message": "aapt: expat exports its header files now.\n\n(cherrypick of 51348d2007b801c7bd7350f72e2300f1a5a41dd1)\nChange-Id: Iddf0133919d38fc896f97c6796f8228a6decf174\n" }, { "commit": "06e04f76715e05ad5a49b13f541cdebb11f41409", "tree": "4292887b1fdc8bafd8936b22ea9faa1d75ff2b94", "parents": [ "10653cef2ae7eb6e1dff1063ddde24347c350bae" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jul 16 17:55:31 2015 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jul 21 12:55:13 2015 -0700" }, "message": "Use build_number from file\n\nImprove incremental ninja builds by keeping the command line the same\nacross builds.\n\nChange-Id: If9dfcee74a4d282c183f9669e14a89104c115a71\n" }, { "commit": "37b894c9f844829e008e69bc66bd160d32812743", "tree": "2884ef53773e46d36a3af1f4c30cf316dc3bd696", "parents": [ "3108dabf05862f8f14e05a7da1cdbc398f78c49d", "94fed352f6f4dc1c53ea69a0cee3944f55b92d99" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Sat Jul 11 02:03:58 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Jul 11 02:03:58 2015 +0000" }, "message": "am 94fed352: am 188af044: Merge \"Revert \"frameworks/base: libexpat now exports its headers.\"\"\n\n* commit \u002794fed352f6f4dc1c53ea69a0cee3944f55b92d99\u0027:\n Revert \"frameworks/base: libexpat now exports its headers.\"\n" }, { "commit": "ba7e659b5563537efffed1308ba3a1da98b5bf78", "tree": "6f6e5e89e9fa0438cfc2e888f366613a10efad16", "parents": [ "2f31b66c04b1e80fd039418edf41e74f67b68143" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Sat Jul 11 01:07:39 2015 +0000" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Sat Jul 11 01:07:39 2015 +0000" }, "message": "Revert \"frameworks/base: libexpat now exports its headers.\"\n\nThis reverts commit 2f31b66c04b1e80fd039418edf41e74f67b68143.\n\nChange-Id: Ib4ce610d1767db5c72c54d33520e8bdf50171a18\n" }, { "commit": "3108dabf05862f8f14e05a7da1cdbc398f78c49d", "tree": "57f483ab78406f97e321dce6bf776c2e24779627", "parents": [ "6ae031fc7534569f31b809e1ca5552a7d0902aef", "4d4c45071b56089112bcfc687d635b966b810f4b" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Sat Jul 11 01:04:37 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Jul 11 01:04:37 2015 +0000" }, "message": "am 4d4c4507: am 220b61f1: Merge \"frameworks/base: libexpat now exports its headers.\"\n\n* commit \u00274d4c45071b56089112bcfc687d635b966b810f4b\u0027:\n frameworks/base: libexpat now exports its headers.\n" }, { "commit": "2f31b66c04b1e80fd039418edf41e74f67b68143", "tree": "2958225cd2eb04ff10888daab727884829b3db95", "parents": [ "43a2aca4c279d3db8abdf4692249134fdd69bd96" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Jul 10 11:12:22 2015 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Jul 10 11:12:22 2015 -0700" }, "message": "frameworks/base: libexpat now exports its headers.\n\nChange-Id: Iaba3d57db18ebdd89e4a993436e9bf844722ff87\n" }, { "commit": "729ffa299ca786eb21ba8330096b33c7bcd66fbf", "tree": "bf35ea09eed7ca09f4194fa1980d29ae21e76257", "parents": [ "e42441a232ae1a75cdd2541f974ed8da258b97cd" ], "author": { "name": "Igor Viarheichyk", "email": "viarheichyk@google.com", "time": "Thu May 14 18:47:00 2015 -0700" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Jun 25 09:49:43 2015 +0100" }, "message": "ICU format support for pseudolocalizes.\n\nCustom parser can handle nested ICU messages even if they\nare split into multiple fragments. Code reworked to encapsulate\nall pseudolocalization logic in Pseudolocalizer and PseudoMethods\nclasses. To minimize a changelist size, some static functions\nremained. Fake BiDi pseudolocalization method is reimplemented\nto handle word boundaries correctly. Unit tests added.\n\n(cherry picked from commit cbb1e676b56677ae3585c067f29646dddffb4857)\n\nbug: 22060509\n\nChange-Id: I11968d81984d99501a4d9334ff2e7453a1eb7a00\n" }, { "commit": "dde606924357dd03a5ebf5e62241f84c4f4e152c", "tree": "c2a2bc3dca4701e67ffe522d75577f0a8febd3d8", "parents": [ "b3ac4a771a06e8e480de6a80fd45b2a0aad11ff5", "3277710c10e7b2dcd06bdc7f649346cd302fb3ac" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jun 09 10:54:52 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 09 10:54:52 2015 +0000" }, "message": "am 3277710c: am a121d34c: Merge \"ICU format support for pseudolocalizes.\"\n\n* commit \u00273277710c10e7b2dcd06bdc7f649346cd302fb3ac\u0027:\n ICU format support for pseudolocalizes.\n" }, { "commit": "cbb1e676b56677ae3585c067f29646dddffb4857", "tree": "49d5c42c1721291310840dbf1f1d023dbd5da854", "parents": [ "1052ae00f1c23d9c8e6177cf0469236767de622f" ], "author": { "name": "Igor Viarheichyk", "email": "viarheichyk@google.com", "time": "Thu May 14 18:47:00 2015 -0700" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jun 09 11:28:20 2015 +0100" }, "message": "ICU format support for pseudolocalizes.\n\nCustom parser can handle nested ICU messages even if they\nare split into multiple fragments. Code reworked to encapsulate\nall pseudolocalization logic in Pseudolocalizer and PseudoMethods\nclasses. To minimize a changelist size, some static functions\nremained. Fake BiDi pseudolocalization method is reimplemented\nto handle word boundaries correctly. Unit tests added.\n\nChange-Id: I9fb4baf4e3123df5dd6d182cca02bb7b0489ca71\n" }, { "commit": "5892248580859620db90d5ef2e3c2f48531933fa", "tree": "1aa8d618ee303c56fba94e636d53f46db6e221c9", "parents": [ "8a8ffd4e9b15a04d2af0909205658f08c76bd6b2" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Mon Jun 01 17:59:41 2015 -0700" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Tue Jun 02 02:55:52 2015 +0000" }, "message": "aapt: add option for stricter symbol generation\n\nAdds an option that prevents generating java symbols for string\nresources that don\u0027t have a default localization.\n\nBug: 21537397\nChange-Id: Ifafa942b24d5cdbed93651cde363e859be13d395\n" }, { "commit": "2738c96d998dedfae5b4670d588d0cd299c4ca0f", "tree": "76b8571676d42a9c0b3bfa00f1937eebf2c05698", "parents": [ "038959e851603500eb39b52fef33cbe75dbd73e3" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu May 14 14:25:36 2015 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri May 15 15:10:58 2015 -0700" }, "message": "Add -round and -notround qualifier to android runtime/aapt\n\nThe round qualifier denotes a device with a screen shape that\nis round. The qualifier shows up after the \u0027long/notlong\u0027 qualifier\nand before the orientation \u0027port/land/square\u0027 qualifiers.\n\nChange-Id: I3044258b2703a9165694b79725bade770fa6cea1\n" }, { "commit": "9a59a991ddd10a1bcb1e6523d978ed4ec8228d20", "tree": "0ea8df66a39c92ad5d7d6ddbbe3dab931349ccd3", "parents": [ "d6abbd29b7f453397036cf602655534bbd6c0430" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Mon May 04 14:10:13 2015 -0700" }, "committer": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Wed May 06 00:13:37 2015 +0000" }, "message": "Remove unused aapt target.\n\nBUG: 20765163\nChange-Id: I13f36f76541216c5c1c20ae8866e09038e08e6f8\n(cherry picked from AOSP commit 97627314a4d3e114afe3dbd764a51523e9f0b787)\n\n" }, { "commit": "97627314a4d3e114afe3dbd764a51523e9f0b787", "tree": "3c87c7ac6fb32f9f4504b46a60ddbf21cd55d8f8", "parents": [ "a51f14d00edda3da103585bf7741502e866512e8" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Mon May 04 14:10:13 2015 -0700" }, "committer": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Mon May 04 15:49:46 2015 -0700" }, "message": "Remove unused aapt target.\n\nBUG: 20765163\nChange-Id: I13f36f76541216c5c1c20ae8866e09038e08e6f8\n" }, { "commit": "bb4ed9aa3aec4b787c8cd5e4f04b7f95302b76f9", "tree": "b4ed624379be0c71be7a9d9b93845584cf3fbcc6", "parents": [ "2d954c7b46b40033161f61bebfad213f97821a8d", "815d9bb178a0488ed1579cd230d447630ad0891b" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 29 14:38:15 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 29 14:38:15 2015 +0000" }, "message": "am 815d9bb1: Merge \"Add a static dependency on libbase.\"\n\n* commit \u0027815d9bb178a0488ed1579cd230d447630ad0891b\u0027:\n Add a static dependency on libbase.\n" }, { "commit": "9c8ba9666d2fad27baae11e56d63485a22812d17", "tree": "c8f748f6d9a2ba3cb440266a02abb1f24617aa47", "parents": [ "adbbba9f1dc364e4d3911562fdb8f2e666922e2f" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Apr 28 09:23:26 2015 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Apr 29 14:07:41 2015 +0000" }, "message": "Add a static dependency on libbase.\n\nUsed by libziparchive.\n\nChange-Id: I120494b620c72b36a725b01f1f274f5dc862a9a3\n" }, { "commit": "6e46056abc1c2803ed7f195bab169bbb1cacec6b", "tree": "f68b9654b5dc9e402e79052f1cafa7e60c6d56c3", "parents": [ "d981c0d4f01bb25ba378e865952cf9d48109b9fe" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Apr 21 14:20:15 2015 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Apr 21 14:27:02 2015 -0700" }, "message": "AAPT: Add flag to disable versioning of vector related XML\n\nAAPT automatically versions XML files according to the SDK level\nin which their attributes were introduced. Support libraries\nknow how to handle resources built against newer SDKs, so offer\nthe option to disable some of the automatic versioning, namely\nvectors.\n\nBug:19336994\nChange-Id: I9f9d0ae8f2a0c28404f82e27de416f80e38493c9\n" }, { "commit": "88fa96c7589a076898ac5514925d09a9058df715", "tree": "8ccbbb951d1c88b61fa28e4e3ab02541e55885a3", "parents": [ "792ae337758786c8efa793c3e28ecc63170e1a81", "106f83ee9cc145a6421d21067c44b513cc148e80" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 09 01:44:38 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 09 01:44:38 2015 +0000" }, "message": "am 106f83ee: am 4cead39a: am 1be312df: Merge \"Re-enable -Wall and -Werror that were lost in a merge\"\n\n* commit \u0027106f83ee9cc145a6421d21067c44b513cc148e80\u0027:\n Re-enable -Wall and -Werror that were lost in a merge\n" }, { "commit": "1be312dfb02e86731da6ac54a39956db791f4978", "tree": "47a4996e85d477e1448a40a0ad486ce11cdbbd23", "parents": [ "e8a3c320e658f6c7f8d1db3d8ad3c3f189c0f54e", "01f185633c1c12017731336e7f926fe398c69781" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 09 00:49:55 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Apr 09 00:49:56 2015 +0000" }, "message": "Merge \"Re-enable -Wall and -Werror that were lost in a merge\"" }, { "commit": "01f185633c1c12017731336e7f926fe398c69781", "tree": "ab1546ae2c5ba5756df24bbe4a5dc3629ac04a9c", "parents": [ "dbd9a4b651aed25a50976ca0a68a979cc3f299fa" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Apr 08 17:29:00 2015 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Apr 08 17:48:23 2015 -0700" }, "message": "Re-enable -Wall and -Werror that were lost in a merge\n\n-Wall and -Werror were lost during a merge when they were added to\naaptCFLAGS instead of aaptCFlags. Fix the typo, and the warnings\nthat crept in while it was disabled.\n\nChange-Id: Ib944b8d6149278e4f3861c1acac277bcd95cc7c2\n" }, { "commit": "dda35c37ead316d671c16a168ffdb9c4b3321e4d", "tree": "b0b7771766179dfe66a90ff13bb276385abcc21e", "parents": [ "b7f9aca713dccde48ac040a1e6b8b7f281e910f0", "66d9451273c4a3775b6b63a0e4b7027bd2eae65d" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Apr 03 20:58:25 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Apr 03 20:58:25 2015 +0000" }, "message": "am 66d94512: am dbb5f5d6: am efcbaec1: Merge \"Only Windows doesn\\\u0027t have %zd.\"\n\n* commit \u002766d9451273c4a3775b6b63a0e4b7027bd2eae65d\u0027:\n Only Windows doesn\u0027t have %zd.\n" }, { "commit": "b12f2410c7bdbf90bd8a77b897846ee2763e3037", "tree": "47038fdc39ec8491b35a3ad455e456e92775bf02", "parents": [ "64b0062a373102f83837faade20b469685758139" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Apr 03 12:56:45 2015 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Apr 03 12:56:45 2015 -0700" }, "message": "Only Windows doesn\u0027t have %zd.\n\nChange-Id: I0e4b0fdc61641c5ecb724fd096bd2315dcf8ed4a\n" }, { "commit": "47fe60a643d5d138ee3b0d836a1c4ab8b6e5b730", "tree": "b50fada585a400bb915cb2cbc44e4c31eda85588", "parents": [ "0964cfc384398cdacd82030649b9c43b95ffa970", "8a9355a98ece3d7fc9d022e759d05378060c86e2" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Mar 20 20:46:39 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 20 20:46:40 2015 +0000" }, "message": "Merge \"Output modified bcp47 tag in ResTable_config::toString()\"" }, { "commit": "644cb092757dd002d1e7c464e57e3e609d26b9ae", "tree": "80a8251b5bd6b1422ddb71d2d5c8e9022026b113", "parents": [ "3816e4a73af376126943fe181d5dea9f3e07826a", "0634fba5915073e5b46e24f0ba0d5bbc44c922a5" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Mar 19 18:27:04 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 19 18:27:04 2015 +0000" }, "message": "am 0634fba5: am 89da4ca6: Merge \"Remove unused printapk.cpp.\"\n\n* commit \u00270634fba5915073e5b46e24f0ba0d5bbc44c922a5\u0027:\n Remove unused printapk.cpp.\n" }, { "commit": "e519c81f352ba75ddc7b559e4e357ef4d2b55bea", "tree": "bf0c0dd239443fe1293bc99d7143c2ae9f0f093a", "parents": [ "008ec61e0ccff0ca92cc0d2b5b73a1d620d3aad3" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Mar 19 09:03:41 2015 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Mar 19 09:03:41 2015 -0700" }, "message": "Remove unused printapk.cpp.\n\nThis is one of the few remaining users of libzipfile, but doesn\u0027t get built.\nNot worth porting to libziparchive.\n\nChange-Id: Ica466b22e3a7ebaf123727c0d703af39cc89cf9c\n" }, { "commit": "8a9355a98ece3d7fc9d022e759d05378060c86e2", "tree": "d6d76f94f2688f9bcee4c961dafc4cc3ec97a6bd", "parents": [ "9c329b8b6440823ef94bffebc0b1098e8b2ad622" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Mar 10 16:55:43 2015 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Mar 16 22:25:26 2015 +0000" }, "message": "Output modified bcp47 tag in ResTable_config::toString()\n\nWe expect to be able to parse the output of ResTable_config::toString(),\nso it should use modified bcp47 (b+en+Latn+US).\n\nChange-Id: I597a1779a1fa5cff171c473e6a0368d93b9c7722\n" }, { "commit": "9b754a1bb8c4111d31c70d418c0160192889117e", "tree": "4295a858f4d485e8a75a9040c811a6d3fddbb301", "parents": [ "67cf4a06c7f12389ccf131627bfcdfe8409fa598" ], "author": { "name": "Vishwath Mohan", "email": "vishwath@google.com", "time": "Thu Mar 12 10:47:14 2015 -0700" }, "committer": { "name": "Vishwath Mohan", "email": "vishwath@google.com", "time": "Thu Mar 12 11:08:28 2015 -0700" }, "message": "Handle malformed manifests in printXMLBlock\n\nSpecially crafted manifest files can cause a segfault in printXMLBlock()\nusing improper tag nesting (without evaluating to\nResXMLTree::BAD_DOCUMENT). This fix checks and breaks when this\ncondition is detected.\n\nBug: 15549617\nChange-Id: I27997fda86d228e993217a0c09993bff404cf317\n" }, { "commit": "9488813873735174d762615ea8a78cf60c21c10f", "tree": "9192139d13315b44d4475553f05e4c7e4ec323d9", "parents": [ "0affc5f3eb0d42376d65410aea4b951d7167ae55", "7a79c4cac3b0c722832e868346db2375b6d6c379" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Mar 05 23:56:53 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 05 23:56:53 2015 +0000" }, "message": "am 7a79c4ca: am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-aosp-master\n\n* commit \u00277a79c4cac3b0c722832e868346db2375b6d6c379\u0027:\n Stop using namespace std.\n" }, { "commit": "f8d6a4ba8739e16e13ae0014efa099ec564939a7", "tree": "3359c566008dcbe79e5553503e37a754fea16b1e", "parents": [ "ecc20aafa6f3d272292e7b3577c99f2c127e590f", "701f9c2fd8d4e31c5ed3a51e4767d4aeb9b20c40" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Mar 05 15:41:39 2015 -0800" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Mar 05 15:41:39 2015 -0800" }, "message": "resolved conflicts for merge of 701f9c2f to stage-aosp-master\n\nChange-Id: I42e0411c0acef4b15137491ecaaed95d9b1cd0c1\n" }, { "commit": "030f536009b56dbcc23d284541e51562bd9a6ed3", "tree": "ffa22213bbcf93fa38c4d5741100f82f55236cfa", "parents": [ "56fde9e70ef850ca7e3f076e52567f5c75b5e7da" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Wed Mar 04 13:54:20 2015 -0800" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Wed Mar 04 13:54:20 2015 -0800" }, "message": "Stop using namespace std.\n\nThe pattern of #include and using namespace std here fails to build\nwith GCC. At first glance it\u0027s a GCC bug rather than libc++ doing\nsomething wrong. Regardless, it can be worked around by just\nspecifying std:: where appropriate.\n\nBug: 19606303\nChange-Id: I5652682eae7ca7559cf2a9307909859013440781\n" }, { "commit": "97a366f9d7d7a089195794b86e78fee782828607", "tree": "a3d2f6eab7dc7630fe4a53753577ac4f28c39c42", "parents": [ "535809ab83f0f57ddf3dba7429f2513d8d943ce3", "7f1a8957cca420d525719836069b7f6d5ee04718" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Feb 11 14:01:35 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Feb 11 14:01:36 2015 +0000" }, "message": "Merge \"Parse res-car as resources for UI_MODE_TYPE_CAR..\"" }, { "commit": "4308c2aea45a4780b460734ee8634d74205c15c5", "tree": "498f4cb77b8ec300600636ef72693736b9468cdd", "parents": [ "c6ec79913fbcf5b915ed55f3cc7b49690ee997f9", "449988872be61f273c91db13069d5b7172429032" ], "author": { "name": "Chris Warrington", "email": "cmw@google.com", "time": "Tue Feb 10 20:14:44 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Feb 10 20:14:44 2015 +0000" }, "message": "am 510c24e8: Merge \"Fix AAPT daemon mode with paths containg spaces.\" into lmp-mr1-dev\nautomerge: 4499888\n\n* commit \u0027449988872be61f273c91db13069d5b7172429032\u0027:\n Fix AAPT daemon mode with paths containg spaces.\n" }, { "commit": "7f1a8957cca420d525719836069b7f6d5ee04718", "tree": "7a1b1296267ba7429581f1bd854dcc9192dfc315", "parents": [ "3ec5f97ac5705d5fe2c7ceb7b61a4df5f18b980f" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Feb 10 16:11:55 2015 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Feb 10 16:11:55 2015 +0000" }, "message": "Parse res-car as resources for UI_MODE_TYPE_CAR..\n\n.. and not a 3 letter language code.\n\nbug: 19291216\nChange-Id: I01bf76d89880693dcdb4384d5c239902fa3defa8\n" }, { "commit": "de3ab0a9e8609f6a631b2c047f352069bb9cfa86", "tree": "38f6f86f25ece3125b0dbece7b39957dc2fc82a2", "parents": [ "b2ba6dfc7b33ec9e58d9f556206440a26069e264" ], "author": { "name": "Chris Warrington", "email": "cmw@google.com", "time": "Mon Feb 09 21:04:46 2015 -0800" }, "committer": { "name": "Chris Warrington", "email": "cmw@google.com", "time": "Mon Feb 09 21:20:52 2015 -0800" }, "message": "Fix AAPT daemon mode with paths containg spaces.\n\nUse new line as a delimiter rather than space.\nFixes: https://code.google.com/p/android/issues/detail?id\u003d135757\nGradle CL: https://android-review.googlesource.com/130423\n\nChange-Id: I7c73e680b0417b0e7cff9e0110822675c53ae20f\n" }, { "commit": "e03f2cb2c26d30c277d38566976bb4b00326d465", "tree": "35b907f7852b78fa045c6f97aa56520bf3dc1858", "parents": [ "92baed1212dffcae042a33f5575f99d3e00f81c8", "83f58a2f7afac98199536b3090fe6f767ffb3a0d" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Jan 23 02:46:32 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 23 02:46:32 2015 +0000" }, "message": "Merge \"AAPT: Use the right enum when checking for density configurations\" into lmp-mr1-dev automerge: b443610\nautomerge: 83f58a2\n\n* commit \u002783f58a2f7afac98199536b3090fe6f767ffb3a0d\u0027:\n AAPT: Use the right enum when checking for density configurations\n" }, { "commit": "ed643e81827797bd22069bf4283348d49fded891", "tree": "895fa4cb89e68f0a4a5e6a9c992651de4be297df", "parents": [ "aee7225e34376a90e8c25e5df53604085cc1b712" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Jan 22 18:19:44 2015 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Jan 22 18:19:44 2015 -0800" }, "message": "AAPT: Use the right enum when checking for density configurations\n\nBug:19116675\nChange-Id: I2322d8d6bdf890005c80014273e5d07df735ed50\n" }, { "commit": "5c61dfc25fed75a436dc32b0fb18854bde0c4cea", "tree": "0eae0de74a065094073690f7060d7a0ebf137b8b", "parents": [ "4d5e761a34c73a700757ade349e9a05b3335f617", "e488ce8668538b45c586eba21f5bca288d749686" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Jan 14 20:47:47 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 14 20:47:47 2015 +0000" }, "message": "am e488ce86: am 94e30215: Merge \"AAPT: Handle all old unversioned attribute usage\" into lmp-mr1-dev\n\n* commit \u0027e488ce8668538b45c586eba21f5bca288d749686\u0027:\n AAPT: Handle all old unversioned attribute usage\n" }, { "commit": "28994d8d181c286b39811441ce78399576c2d315", "tree": "2e1d2308c8c49184fc04ad98994f95ed4d462961", "parents": [ "7ce662ef870df34cd189b4ce9e487e496ba407dd" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Jan 13 13:42:41 2015 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Jan 14 12:02:15 2015 -0800" }, "message": "AAPT: Handle all old unversioned attribute usage\n\nAll references to attributes defined in pre-LOLLIPOP_MR1 SDK\nare moved to version qualified resource entries.\n\nBug:18221682\nChange-Id: Ifd739530ebcf99e6bc7ddb3f10bc5e05f0726e62\n" }, { "commit": "6e2eb2df4cb8ca4d0eeda0fb38e1a67136a0d275", "tree": "70a3dcfd3dbcf71862d24153c390ff1db5a44e34", "parents": [ "0e2fdb43122c53c3a63bc3810c93c30083d92866", "c04a21a0ef6cd97a45307e4c1de9088e57719ca2" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Jan 08 20:24:33 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 08 20:24:33 2015 +0000" }, "message": "am c04a21a0: Merge \"Fixup aapt usage message\" automerge: 64044d0\n\n* commit \u0027c04a21a0ef6cd97a45307e4c1de9088e57719ca2\u0027:\n Fixup aapt usage message\n" }, { "commit": "6ab7a7849cc0bb93fa637bd93ab71c287e6878fe", "tree": "14dcc35f68a0d45e77eb14162b1295046f311579", "parents": [ "dcf323adaf3d59fb720dc534380090f9df3a618c" ], "author": { "name": "Johan Redestig", "email": "johan.redestig@sonymobile.com", "time": "Wed Jan 07 09:24:39 2015 +0100" }, "committer": { "name": "Johan Redestig", "email": "johan.redestig@sonymobile.com", "time": "Wed Jan 07 09:40:58 2015 +0100" }, "message": "Fixup aapt usage message\n\nThe --preferred-configurations option was renamed to\n--preferred-density in fab5087 but only part of the\nusage message was changed.\n\nChange-Id: I89d270990023beca19605901d956d29d0b0b848b\n" }, { "commit": "915f44e1ee98f8c1d1b9ac0ac45ee05d656734a6", "tree": "3caa7f670f3927b6f7386aba249f3bfba1f606ca", "parents": [ "8a23b3820d6f4d08b6b6ca3ffb0f85bd829f5e97", "503a4494d64d30f9b904b24a56fff986810da610" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Dec 16 18:02:09 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 16 18:02:09 2014 +0000" }, "message": "am 503a4494: am f1f179a7: Merge \"AAPT: Copy android:revisionCode to Splits\" into lmp-mr1-dev\n\n* commit \u0027503a4494d64d30f9b904b24a56fff986810da610\u0027:\n AAPT: Copy android:revisionCode to Splits\n" }, { "commit": "f1f179a765b6969ba51574d4a10b0381acb0f945", "tree": "d8cd446b33247c93fb68f24c32c148611c0ddda0", "parents": [ "d8ce65c9b5142ff9aeadb4caecd46a4811021d7b", "54de298c01ad79fe7f5850eb7aefc2542dd8d5da" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Dec 16 17:50:02 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 16 17:50:04 2014 +0000" }, "message": "Merge \"AAPT: Copy android:revisionCode to Splits\" into lmp-mr1-dev" }, { "commit": "54de298c01ad79fe7f5850eb7aefc2542dd8d5da", "tree": "7e7b5001571265a66474e793bcd6c00ed81797d5", "parents": [ "4df65bf1eb454814954421403da9f8b5fcb82180" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Dec 16 09:16:26 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Dec 16 09:16:26 2014 -0800" }, "message": "AAPT: Copy android:revisionCode to Splits\n\nBug:18706179\nChange-Id: I669b56e0b67dd1bfda7749ef433b55af16851154\n" }, { "commit": "22bfb75ebb949ff05d34ad22fbcc888582aaaaa4", "tree": "dcf12a59cc9555618478515a7fb3f2571a8ff4b7", "parents": [ "4800de0f7ce810f57db4259a6f6a7d02484800ea", "465d123464eadf180b618164b2ed23702bca3d86" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Dec 16 01:43:16 2014 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Dec 16 01:43:16 2014 +0000" }, "message": "am 0f0e85a6: Merge \"AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices\" into lmp-mr1-dev\nautomerge: 465d123\n\n* commit \u0027465d123464eadf180b618164b2ed23702bca3d86\u0027:\n AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices\n" }, { "commit": "0f0e85a68961e303ac85d31fb36ec8384277349d", "tree": "8002062cff2e357b63eaf7bd5bd46e415438f0d3", "parents": [ "613fffcd0f17eecb0231fe24f7abf7936eef8d37", "ea4e5ecc27793b5c1dd2eda291f752b3f900ee6c" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Dec 15 23:35:21 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Dec 15 23:35:23 2014 +0000" }, "message": "Merge \"AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices\" into lmp-mr1-dev" }, { "commit": "ea4e5ecc27793b5c1dd2eda291f752b3f900ee6c", "tree": "efdd249d1298cdcdd9d35b668660c25e14fa00c4", "parents": [ "4df65bf1eb454814954421403da9f8b5fcb82180" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Dec 10 15:46:51 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Dec 10 15:55:27 2014 -0800" }, "message": "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices\n\nThere was an inconsistency in the indexing when removing attributes\nin layouts. Now we account for that shift that happens when you delete\nan attribute.\n\nBug:18707321\nChange-Id: I656eee3fb614168fa8ceeff379e8594708961dad\n" }, { "commit": "55188f591844ce34e9c1862f10a85d89fa20cb91", "tree": "ee23a4d8dff7deef4b247a4c039d3c48b6e95134", "parents": [ "2bbf5575e71f414d7ad8333d5daeef13ace04cfa", "c765655ae1ae35f9d5f0958295f0b71270132ca7" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Dec 09 00:43:14 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 09 00:43:14 2014 +0000" }, "message": "am c765655a: am fbba9b57: Merge \"AAPT: Dump status of required flag for uses-feature\" into lmp-mr1-dev\n\n* commit \u0027c765655ae1ae35f9d5f0958295f0b71270132ca7\u0027:\n AAPT: Dump status of required flag for uses-feature\n" }, { "commit": "73a05114b051c6dcf5e5126ac94eaf8cac0ab289", "tree": "cf384116b1fba67c0ba0479529f193ff7a2fa7ef", "parents": [ "4df65bf1eb454814954421403da9f8b5fcb82180" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Dec 08 12:53:17 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Dec 08 15:54:12 2014 -0800" }, "message": "AAPT: Dump status of required flag for uses-feature\n\nOutside of a feature-group, the legacy uses-feature tag\nhas a boolean required flag that should be emitted in\ndump badging.\n\nBug:17790999\nChange-Id: I43023af00e9c9ed4bc35795c3a983fc719bf9b7a\n" }, { "commit": "e97908d32ee8ea80138d085260a0eac93841c722", "tree": "0fb24cd7ef6cf6236d3451296937262b78fe2efc", "parents": [ "501bf216dc9068c8169687437d8d6594cd1e1165", "0953ab276449cf8d2b27d4f68cb213dfe317a3b4" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Dec 05 11:06:21 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Dec 05 11:06:21 2014 -0800" }, "message": "Merge commit \u00270953ab27\u0027 into manualmerge\n\nChange-Id: I36dea45f7571096136ea7bda5e2680bd85a0df32\n" }, { "commit": "720beef28dacc924d77576f63fced84e6a820dc6", "tree": "11cdfd10ab302973dd88a6928a8637d461a080fd", "parents": [ "391232da084d715b9f20539a98b4a49cc56bf949", "9b624c186cb6059dfb3ec24bfb6386a0fc17b88c" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Dec 04 18:24:39 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 04 18:24:41 2014 +0000" }, "message": "Merge \"AAPT: Move private attrs to new type for framework\" into lmp-mr1-dev" }, { "commit": "9b624c186cb6059dfb3ec24bfb6386a0fc17b88c", "tree": "e57516e076eddb75d4c657704522f43067153c2a", "parents": [ "92ad4dd017a13364b4001bdb04911202932f81c2" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Nov 19 17:49:26 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Dec 03 15:59:20 2014 -0800" }, "message": "AAPT: Move private attrs to new type for framework\n\nPrivate attributes are typically placed after public\nattributes in the resource table. Each time a new version\nof the Android framework is released, new public attributes\ntake the place of the private attributes, and the private\nattributes are shifted after the new public ones.\n\nThis means that any apps built against the newer SDK\nmay inadvertently be using private attributes on older\ndevices.\n\nThis change moves all private attributes to a completely\ndifferent type ID, so there will never be collisions across\nversions.\n\nThese private attributes are automatically moved to a synthesized\ntype only for the system resources.\n\nBug:18263655\n\nChange-Id: I7a850512953fadcc9f3524d509cea30249782db8\n" }, { "commit": "455550d5869e6ca1433802b06e15d415b6f86e6b", "tree": "fa2596c4736f06d6bb534c8bd4ad8bffbc981c56", "parents": [ "b46e9da64c51bcbfdd21b8e18850064eeb50d930", "72a6aeaca0712d9b72b9f773e2b72bb45ddd3cb8" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Dec 03 20:42:22 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 03 20:42:22 2014 +0000" }, "message": "am 72a6aeac: am 91ca64ea: Merge \"AAPT: Add pathMotion custom classes to Proguard Keep set\" into lmp-mr1-dev\n\n* commit \u002772a6aeaca0712d9b72b9f773e2b72bb45ddd3cb8\u0027:\n AAPT: Add pathMotion custom classes to Proguard Keep set\n" }, { "commit": "62c5df52e771e8cf490ee42e5d1516ec10170679", "tree": "ded8265fdf1fe1ef02b3dd94f0c6d1e1db2f4220", "parents": [ "4c488ff931fe6b2fc79ef854febc98b4cb748402" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Dec 02 16:19:05 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Dec 02 16:23:59 2014 -0800" }, "message": "AAPT: Add pathMotion custom classes to Proguard Keep set\n\nBug:18590044\nChange-Id: Ia5dbf55317d2cc89826316e8d10f031b5d340e57\n" }, { "commit": "3550c6c5d67740b8ea77b2921146780fe340f34e", "tree": "a0b7e0943d0ac21b9fef5972302011ddaa2c152e", "parents": [ "233d700efc5f308fe32acc5984b636860e4fc7b0", "f17611a29e3b0d0c7a5d28a1ce92682a2c097de6" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Dec 03 00:05:33 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 03 00:05:33 2014 +0000" }, "message": "am f17611a2: am 130e30fe: Merge \"AAPT: Add custom transition classes to Proguard keep set\" into lmp-mr1-dev\n\n* commit \u0027f17611a29e3b0d0c7a5d28a1ce92682a2c097de6\u0027:\n AAPT: Add custom transition classes to Proguard keep set\n" }, { "commit": "4c488ff931fe6b2fc79ef854febc98b4cb748402", "tree": "83c4d20398ce41b7ade1bc1ea460e3e2a87c5fdf", "parents": [ "92ad4dd017a13364b4001bdb04911202932f81c2" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Dec 02 14:50:21 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Dec 02 15:40:17 2014 -0800" }, "message": "AAPT: Add custom transition classes to Proguard keep set\n\nBug:18590044\nChange-Id: Ib24831e669a09f0e6f32434081c0e2499702399c\n" }, { "commit": "6698749dd4d4d6513b26aa9071af290b956b68a7", "tree": "6c0716e521b60ff501f4aa4a3f7aff160578135f", "parents": [ "36c7f4b67326bad547f16aa6e72140bd839ab28d" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Nov 20 11:41:21 2014 -0800" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Nov 20 11:47:40 2014 -0800" }, "message": "Add appropriate casts for char16_t.\n\nC++11 defines a real char16_t, which is not implicitly convertible to\nuint16_t (and by extension jchar). Add casts as needed.\n\nBug: 18300613\nChange-Id: I00752002ef2e938bdb57f70947e8fd53ec103293\n" }, { "commit": "d493fa6d797cbdd805f009f7403f2a046190b5d4", "tree": "7620aa29b37359e9de50b5d342a13784d80087df", "parents": [ "3c922dd7f2c82ae09c5ccf5a7b3a338ef682fe65", "537888be7d5cfa6bfa9ddd459a622ea208339735" ], "author": { "name": "Yabin Cui", "email": "yabinc@google.com", "time": "Thu Nov 13 19:05:06 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 13 19:05:06 2014 +0000" }, "message": "am 537888be: Merge \"kill HAVE_LOCALTIME_R\"\n\n* commit \u0027537888be7d5cfa6bfa9ddd459a622ea208339735\u0027:\n kill HAVE_LOCALTIME_R\n" }, { "commit": "25d58a93571119af35044b54f559e9f88b0b2fff", "tree": "34ab5c9e87fa304b505bfd60f405b13aad01c869", "parents": [ "f0044947a7199278d529c9b0b53cde089851ce23" ], "author": { "name": "Yabin Cui", "email": "yabinc@google.com", "time": "Thu Nov 13 09:57:22 2014 -0800" }, "committer": { "name": "Yabin Cui", "email": "yabinc@google.com", "time": "Thu Nov 13 09:57:22 2014 -0800" }, "message": "kill HAVE_LOCALTIME_R\n\nBug: 18361583\nChange-Id: Ia79e2b641fd6c61ae5d2b8f2db5456bd3d36a25b\n" }, { "commit": "b28ff487fb6db4a44e4d18aa17d8253f00a63bb6", "tree": "3e86f055fb0dd069bc41ba7c1270780fa34e9aaf", "parents": [ "56dd295b69a78017baf44491cb27fcaaf8101f1c", "5e6cf24213c5eacc9d3e3c8da5826be4a23f22af" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Wed Nov 12 13:24:42 2014 -0800" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Wed Nov 12 13:24:42 2014 -0800" }, "message": "resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp\n\nChange-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9\n" }, { "commit": "ff1d8a6635fb6441615778a47e2881129574a5b1", "tree": "d2f490ec6a546461eda288e4383a50796d68059c", "parents": [ "34acb4c8d4abe1c4f580b85ddc84b18b7e38e417" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Tue Nov 11 19:31:26 2014 -0800" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Wed Nov 12 11:22:20 2014 -0800" }, "message": "Move frameworks/base over to libc++.\n\nBug: 15193147\nChange-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e\n" }, { "commit": "be6c125783686be593e958725249ffcff5717fc4", "tree": "f2911bd19b7c7a58c5644ff8fe9c2825d8e2882d", "parents": [ "3aa19984adc6f3e26e4b8551ab663de8b23afc29", "1e2e05bf8cb1445f9e431ca54837bb01f762d9e6" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Nov 11 22:15:44 2014 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Nov 11 22:15:44 2014 +0000" }, "message": "am da772234: Merge \"AAPT: Ignore densities specified in -c flag\" into lmp-mr1-dev\nautomerge: 1e2e05b\n\n* commit \u00271e2e05bf8cb1445f9e431ca54837bb01f762d9e6\u0027:\n AAPT: Ignore densities specified in -c flag\n" }, { "commit": "d660e05c84c7412336ca5510ff9514357e9ba074", "tree": "c8ef441a63ea9289c94c74907de6a7152ff790ba", "parents": [ "044f323e624084de464e780828f1d7f204e4d01d", "8aa93764ea025b1c20f96b366ae6efb17e4f2d67" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Nov 11 19:53:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 11 19:53:52 2014 +0000" }, "message": "am 8aa93764: Merge \"Fixing NULL pointer access causing segmentation fault in aapt\"\n\n* commit \u00278aa93764ea025b1c20f96b366ae6efb17e4f2d67\u0027:\n Fixing NULL pointer access causing segmentation fault in aapt\n" }, { "commit": "a2bb565db553e3def89a6e010b59f2fd1db98ff4", "tree": "9f50b0b4c146eb4b8557f51661ee5d198fd87a2d", "parents": [ "85d558cd486d195aabfc4b43cff8f338126f60a5" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 10 17:56:11 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 10 17:56:11 2014 -0800" }, "message": "AAPT: Ignore densities specified in -c flag\n\nThe --preferred-density flag knows how to handle missing resources of\nspecific densities. Using -c with a density leads to missing resources.\n\nChange-Id: I2251d842f48c08ed083663bb7ed608e14c4983c8\n" }, { "commit": "4d29c6693090cb9a0be209f9cfd0aef307fe52ed", "tree": "65c9af94f6045205dda8a337ad2ca9fc7d844944", "parents": [ "984d81c3937d46240fb9645ffa37c5166284a983", "fa31eb2cd1705cdb77f8d8dd9b5761bc773cbb9d" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 10 14:32:11 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 10 14:32:11 2014 -0800" }, "message": "Merge commit \u0027fa31eb2c\u0027 into manualmerge\n\nConflicts:\n\ttools/split-select/RuleGenerator_test.cpp\n\nChange-Id: I0d1261301d433f32e857cf1b0d75a861205f7625\n" }, { "commit": "da44fe0e1f7c177cd65b7c5c80b35ec8fb3bc1c2", "tree": "125b68da3d72e46b95323493d0fbebfe39dd36b7", "parents": [ "59701b9ba5c453e327bc0e6873a9f6ff87a10391" ], "author": { "name": "Jörgen Ekström", "email": "jorgen.ekstrom@sonyericsson.com", "time": "Thu Mar 24 15:09:42 2011 +0100" }, "committer": { "name": "Johan Redestig", "email": "johan.redestig@sonymobile.com", "time": "Fri Nov 07 13:41:06 2014 +0000" }, "message": "Fixing NULL pointer access causing segmentation fault in aapt\n\nIn cases where resource packages are generated which does\nnot have public resources for all resource types - NULL\npointers sneaks into the mOrderedConfigs vector causing\nthe aapt tool to crash. The solution in this fix simply\nignores the NULL elements when later processing the sorted\nvector.\n\nThe NULL elements are inserted during applyPublicEntryOrder\nfunction call\n\nChange-Id: I8b7135932e2d235018da2e2f7e09f0d22f1b2f59\n" }, { "commit": "dcdfe9fef4b07ee53d312c3fbecc74cb215ace6f", "tree": "1e689ea612de5ab03f10144b4103fae511b564e8", "parents": [ "d12b69518daabff3c13482f4b5140020b747b71f" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Nov 06 12:54:36 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Nov 06 14:57:34 2014 -0800" }, "message": "split-select: Fix rules generated for anydpi density\n\nChange-Id: I9de569ca9a76eb22df4d0e178df847ba1c7d0b01\n" }, { "commit": "685d363d7a3e8833edc9368a3c59b69755e0ba29", "tree": "e04662b84ae8cc05665206336a148928c23b7cab", "parents": [ "b3d260222fd003c8b537bb9f86625a200bd0f999", "fb96e54ba8d43a9f3162c92760e53ab61c7486ff" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Nov 05 12:30:25 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Nov 05 12:30:25 2014 -0800" }, "message": "Merge commit \u0027fb96e54\u0027 into manualmerge\n\nConflicts:\n\ttools/aapt/Resource.cpp\n\nChange-Id: I4147c3550e9426f3429146eaeb16f10ba76b5b15\n" }, { "commit": "8a5bb15efaa55ff57a92e36d2b9e33d1f34c9608", "tree": "ef44daf0e3ee027c8e9f425d86cac613fb957325", "parents": [ "b2808c03c3de0d4fe6a986545fd506df0233b072" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 20:35:54 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 20:35:54 2014 -0800" }, "message": "Fix automerge issue\n\nDuplicate method declaration.\n\nChange-Id: I9355bd7c716e668ad7892fd12e93352455d149b5\n" }, { "commit": "b2808c03c3de0d4fe6a986545fd506df0233b072", "tree": "f35e27327287e7b4e5a68b6e357871c8e9c3637a", "parents": [ "89ff8726545e9cced824c655c8e46d1e8f82aa5e", "0cc963c66334acbcaef7f50c2415080b56c60c78" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Nov 04 03:37:49 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 04 03:37:50 2014 +0000" }, "message": "Merge \"Fix build due to bad merge\" into lmp-mr1-dev-plus-aosp" }, { "commit": "0cc963c66334acbcaef7f50c2415080b56c60c78", "tree": "498e4d22ce6f8f373fd86c63c2ccd089998930ec", "parents": [ "3fd340028fc24198edb23ddf5eb5a0a100bab745" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 18:37:49 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 18:37:49 2014 -0800" }, "message": "Fix build due to bad merge\n\n- tools/aapt/qsort_r_compat.c was removed\n and the merge added it back to the src list in Android.mk\n\nChange-Id: I15aae8adc68f82ac2381020ac0b96a7b1ab59f9c\n" }, { "commit": "4dfff4e7276ef98e4c5b84ef715b75a80b01f5c7", "tree": "30fe0bfb854771b3880d18de6f599ba97bb79c58", "parents": [ "3fd340028fc24198edb23ddf5eb5a0a100bab745", "5fa9021822577f1e4676db49a6b5cb5d36e4614a" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Nov 04 02:20:47 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 04 02:20:47 2014 +0000" }, "message": "am 5fa90218: am f7ffcaa7: Merge \"Build the split-select tool without C++11 support\" into lmp-mr1-dev\n\n* commit \u00275fa9021822577f1e4676db49a6b5cb5d36e4614a\u0027:\n Build the split-select tool without C++11 support\n" }, { "commit": "3fd340028fc24198edb23ddf5eb5a0a100bab745", "tree": "489ffeed9998280d7402b74ed78bcc61d6cd8872", "parents": [ "7fd12db350a341eb7a50759aa329be5281556928", "78be0498af2b7d5b6855701ef316f488e2de6f14" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 18:03:53 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 18:06:22 2014 -0800" }, "message": "Merge commit \u002778be0498\u0027 into manualmerge\n\nConflicts:\n\tlibs/androidfw/ResourceTypes.cpp\n\ttools/aapt/Android.mk\n\ttools/aapt/StringPool.cpp\n\ttools/aapt/StringPool.h\n\nChange-Id: I9d69efdfb892032895ace12159d193304f02dc6c\n" }, { "commit": "de7de47fef1dcaa26d553665d89e4d3792325c3f", "tree": "0d9551d2f037b841f325bbbd3ba27a309e9441b3", "parents": [ "f7ffcaa7a478eaafc121e84b14dcaf2503dd5457" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 12:03:08 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 15:55:44 2014 -0800" }, "message": "Add error checking to aapt for split generation\n\nChange-Id: Ica627db6a671f6a6c35f98bfd9c03598ffe103ce\n" }, { "commit": "f7ffcaa7a478eaafc121e84b14dcaf2503dd5457", "tree": "360be2dca990e9d244fc92529ec8d53266ed6d7f", "parents": [ "668f0a356cba44c22d8ca0c9f4711613885d46a9", "c3dc0b57b8d0b3875f868788e110aa67fb032b4a" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 23:38:55 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 03 23:38:56 2014 +0000" }, "message": "Merge \"Build the split-select tool without C++11 support\" into lmp-mr1-dev" }, { "commit": "c3dc0b57b8d0b3875f868788e110aa67fb032b4a", "tree": "d29bf5702b81c4f283ae5e463af00c1e9327d459", "parents": [ "425b1dc88c47e0e9d3a653ad902a69f3ec09b966" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 12:05:15 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 12:09:58 2014 -0800" }, "message": "Build the split-select tool without C++11 support\n\nIt was complicated to get the tool building on Windows, Linux,\nand OSX with C++11 support.\n\nOSX uses Clang to build C++11 binaries, which requires the libc++\nstandard library. Since most of the dependencies of this program\nare built against libstdc++, this was difficult to resolve.\n\nNow we build without C++11 support.\n\nChange-Id: I4e537c113734508a8f480a1c402ed237de4f0e60\n" }, { "commit": "4bf58108d442b37ab4adf5ce3a4ecd63472ce254", "tree": "2b6359ad85861bf339e6a45813c599ab683fc7c3", "parents": [ "e8d9810cdef5b3e288f54f42adc3205532343406" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 11:21:19 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 03 11:49:47 2014 -0800" }, "message": "Fix issues that will be present in C++11\n\n- char16_t is a distinct type, so stay consistent\n with it throughout the code base.\n- char16_t is defined as minimum size of 16 bits.\n Since we mmap and cast data structures onto raw memory,\n we need a precise definition (uint16_t), so we cast between\n that (and static_assert that they are the same size).\n\nChange-Id: I869c32637543bbcfb39d2643e7d9df10d33acd3c\n" }, { "commit": "a9aecc0c29ce9b9692b9b317559f83b2520dcc43", "tree": "5889226f88b60d09c55de7c6714dd67a7da96093", "parents": [ "14dd733073c3003a8d9f0d4201199d5a244100d1", "181c18efd438f7a5e8cc18327367c49bf51795be" ], "author": { "name": "Tim Kilbourn", "email": "tkilbourn@google.com", "time": "Fri Oct 24 21:24:59 2014 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 24 21:24:59 2014 +0000" }, "message": "Merge \"aapt updates for Android TV\" into lmp-mr1-dev automerge: 6af7d76\nautomerge: 181c18e\n\n* commit \u0027181c18efd438f7a5e8cc18327367c49bf51795be\u0027:\n aapt updates for Android TV\n" }, { "commit": "d9b1cad71e8aaf94e7738d2e47d3a06daa3cdf2d", "tree": "a8308e27b4d8c3259ea456e36c0a60a379f5564f", "parents": [ "e41d967c5c6ff42ea41f61c731d77aa687b3956f" ], "author": { "name": "Tim Kilbourn", "email": "tkilbourn@google.com", "time": "Fri Oct 24 12:43:41 2014 -0700" }, "committer": { "name": "Tim Kilbourn", "email": "tkilbourn@google.com", "time": "Fri Oct 24 12:59:24 2014 -0700" }, "message": "aapt updates for Android TV\n\n- Output whether an app claims to be a game (android:isGame)\n- Output android:banner if it is specified at the application level.\n\nChange-Id: I7118b524f62cdfc4effeef21b32b3cdd814d9bfa\n" }, { "commit": "08d1c808477d67fe9f0a2d2ad9463998f8d54379", "tree": "7ce4c3a7abc06109a9070c3a2a8401f4f2adaf93", "parents": [ "41707d01e9e950ebd00642ef3564edcff8c539e7", "cd8442d4e8f372e6ecd90779f8885798145f5366" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Oct 23 14:55:57 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Oct 23 14:55:57 2014 -0700" }, "message": "Merge commit \u0027cd8442d4\u0027 into manualmerge\n\nConflicts:\n\ttools/aapt/ResourceIdCache.cpp\n\nChange-Id: I5341d47ed0fe891d6fefb174f644e636ce966eb8\n" }, { "commit": "40e8eefbedcafc51948945647d746daaee092f16", "tree": "eb14bacf3510fc8865145a1c68b4dcb8fc802904", "parents": [ "74af6700196ed55a0aa39c7777293e735e7b4d73" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Sep 16 14:43:29 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Oct 23 10:39:31 2014 -0700" }, "message": "First commit of split-select tool\n\nThis tool emits a set of rules as JSON for when a Split APK\nshould match a target device.\n\nChange-Id: I8bfbdfbdb51efcfc645889dd03e1961f16e39645\n" }, { "commit": "11d3d1016bf7064f0232278eb0a798dfb33ab00f", "tree": "9125aaa3feb70687ed87a6c31c6016c060a49544", "parents": [ "22cf018313fd2b427c16002a5a14354342b6075e", "9295a1354eb8220be9a0a40985253c6cdfac35c3" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Mon Oct 20 22:01:04 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 20 22:01:04 2014 +0000" }, "message": "am 9295a135: am e40974d9: Merge \"Fix an overflow found by ASAN.\"\n\n* commit \u00279295a1354eb8220be9a0a40985253c6cdfac35c3\u0027:\n Fix an overflow found by ASAN.\n" }, { "commit": "2095ed4ef650809c6ead90ebd1223fa2ad669eea", "tree": "717529984d924e09de72eda906febfc85b7a02a4", "parents": [ "22fc33d6451e34e769fff4af1aaeb1faf05bc2c6", "9295a1354eb8220be9a0a40985253c6cdfac35c3" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Mon Oct 20 22:01:02 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 20 22:01:02 2014 +0000" }, "message": "am 9295a135: am e40974d9: Merge \"Fix an overflow found by ASAN.\"\n\n* commit \u00279295a1354eb8220be9a0a40985253c6cdfac35c3\u0027:\n Fix an overflow found by ASAN.\n" }, { "commit": "d395f7913336417bcbbea740fcdc8589789626bc", "tree": "e1f6abf7cc604e064f9f1168e583d28752eec1b2", "parents": [ "4cd671e4d27befdd576fa86051956c3cafad6808" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Mon Oct 20 14:44:39 2014 -0700" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Mon Oct 20 14:45:55 2014 -0700" }, "message": "Fix an overflow found by ASAN.\n\nSometimes len is 0.\n\nChange-Id: I031000188edc57663a5519b00cbbb751600d32f4\n" }, { "commit": "217b17a915849ac50f01f9097e0e35e2b21e6235", "tree": "60bdcc42ab9edfbb610237fe833d34f14f5d6ebc", "parents": [ "9aa6ea106d7aec78e5ea4ea251c1eac146496fa6", "d3969d927eef2f04ec097244c5f2bff5e7c0689e" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Oct 20 21:16:17 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 20 21:16:17 2014 +0000" }, "message": "am d3969d92: am 6dfe03ae: am 73a8c596: am 3f8c7dec: Merge \"AAPT: Fix path for final generated resources on Windows\" into lmp-dev\n\n* commit \u0027d3969d927eef2f04ec097244c5f2bff5e7c0689e\u0027:\n AAPT: Fix path for final generated resources on Windows\n" }, { "commit": "6dfe03ae6cb6ea7c96c5485f542e42ab59b598a0", "tree": "848766db2a3fb3768eaa4ea0ed478b44dd2605e4", "parents": [ "12d808a24f4af9a127ae851edd06339b77020178", "73a8c5962d4d28a2e8aa6fa0b0b18e39782ee79c" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Oct 20 21:05:04 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 20 21:05:04 2014 +0000" }, "message": "am 73a8c596: am 3f8c7dec: Merge \"AAPT: Fix path for final generated resources on Windows\" into lmp-dev\n\n* commit \u002773a8c5962d4d28a2e8aa6fa0b0b18e39782ee79c\u0027:\n AAPT: Fix path for final generated resources on Windows\n" }, { "commit": "3986e52cf994ea7960dabffb8d6015e400ce3b63", "tree": "319210a0631fdfdd766eed429e5eb811529b89d7", "parents": [ "b12ff841592d6c8cf4846b710d07858e63addbeb", "3f8c7dec6b3fd4ac7fc99fe4e41cd0fa1b97bcad" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Oct 20 20:59:49 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 20 20:59:49 2014 +0000" }, "message": "am 3f8c7dec: Merge \"AAPT: Fix path for final generated resources on Windows\" into lmp-dev\n\n* commit \u00273f8c7dec6b3fd4ac7fc99fe4e41cd0fa1b97bcad\u0027:\n AAPT: Fix path for final generated resources on Windows\n" }, { "commit": "aff7c2447df1ddfe094628317b6d22121cd657f8", "tree": "02f11ac125243065e21563e262bcabec3e3b1055", "parents": [ "00831836cdeeb4a61ba10c724c3ca33280937b62" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Oct 20 12:15:25 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Oct 20 12:15:25 2014 -0700" }, "message": "AAPT: Fix path for final generated resources on Windows\n\nChange-Id: Id11ac79b281b51747c73f90406ebd60023c54f92\n" }, { "commit": "10db7553ec036557032c98cdcd334b55fa1bec10", "tree": "c927a025ee0950c7bfa29f9f49647c8b53d86ffc", "parents": [ "83c97babb00b4b78747d5b14be2ed7dba6f438b0", "dd64fc43a6c560d3c545132adc16cd4a079f9600" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Oct 17 23:12:28 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 17 23:12:28 2014 +0000" }, "message": "am dd64fc43: am effd416e: am 83fae208: am 3cd840f4: Merge \"AAPT: Fix an issue where a resource name was incorrectly derived on Windows\" into lmp-dev\n\n* commit \u0027dd64fc43a6c560d3c545132adc16cd4a079f9600\u0027:\n AAPT: Fix an issue where a resource name was incorrectly derived on Windows\n" } ], "next": "effd416ee3c05c6c378614995fdbe514c8423a48" }