)]}' { "log": [ { "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": "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": "6bf52c4271bd0483174fe3755caedb778693791e", "tree": "75d70d58aa834eab3351cacc178ffa306684d8d3", "parents": [ "0e29681f98dad8df9f772d86a848190138245f3d" ], "author": { "name": "Adam Langley", "email": "agl@google.com", "time": "Fri Apr 24 09:59:35 2015 -0700" }, "committer": { "name": "Adam Langley", "email": "agl@google.com", "time": "Fri Apr 24 10:00:45 2015 -0700" }, "message": "frameworks/base: switch to using NativeConstants.\n\nNativeCrypto is a conscrypt class that contained several OpenSSL\nconstants. NativeConstants is the new class that contains the same\nthing, but the latter is automatically generated and thus won\u0027t drift\nfrom the C headers.\n\nBug: 20521989\n\nChange-Id: I45c7b9a6844a06e3ffd09be692ebf733e1ebbbcc\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": "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": "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": "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": "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": "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": "df5a1987108539c703477adff3749d647ba313c5", "tree": "2bf25f38cabbb522bb66fcb6173bd51c52699f7a", "parents": [ "6a439908fcc103696dd90bc42494231b54b7a10b", "c05343828611ed0b82fae4edf7fe11e0e9087db1" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat Jan 31 04:18:58 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Jan 31 04:18:58 2015 +0000" }, "message": "am 3d5535cf: Merge \"Limited AppCompat support\" into lmp-dev automerge: 7789447 automerge: 580937f\nautomerge: c053438\n\n* commit \u0027c05343828611ed0b82fae4edf7fe11e0e9087db1\u0027:\n Limited AppCompat support\n" }, { "commit": "6a439908fcc103696dd90bc42494231b54b7a10b", "tree": "4499f32ab5c0b9c791d143e1ac7f28d4a116b2c5", "parents": [ "52c39c27e9f5fde74e2d326c6a3560334fbea926", "862cdd6f11490c060842599a58a400e284c937d9" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat Jan 31 04:17:35 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Jan 31 04:17:35 2015 +0000" }, "message": "am 1d59871e: Merge \"Resource resolution fixes.\" into lmp-dev automerge: 7e683bd automerge: 1575ca6\nautomerge: 862cdd6\n\n* commit \u0027862cdd6f11490c060842599a58a400e284c937d9\u0027:\n Resource resolution fixes.\n" }, { "commit": "580937fc45bc5ef97e45f1eaf67945a07c5ce41f", "tree": "30fc6e48920e8d046efdaf7f4a4dba7fe71a2622", "parents": [ "1575ca6e1a713f9d2e4a9f91bc6943ae10fde083", "7789447bd97c851b7a09623a417300590e5439d5" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat Jan 31 03:02:42 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Jan 31 03:02:42 2015 +0000" }, "message": "am 3d5535cf: Merge \"Limited AppCompat support\" into lmp-dev\nautomerge: 7789447\n\n* commit \u00277789447bd97c851b7a09623a417300590e5439d5\u0027:\n Limited AppCompat support\n" }, { "commit": "1575ca6e1a713f9d2e4a9f91bc6943ae10fde083", "tree": "0f144817eab49ea5f68e20df4fc58b69a3cee6e1", "parents": [ "3548de60735a79d3e7087c26ae491a7f38da5b4d", "7e683bdaddff77a24a36d420c5782b47795c5ccb" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat Jan 31 03:01:20 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Jan 31 03:01:20 2015 +0000" }, "message": "am 1d59871e: Merge \"Resource resolution fixes.\" into lmp-dev\nautomerge: 7e683bd\n\n* commit \u00277e683bdaddff77a24a36d420c5782b47795c5ccb\u0027:\n Resource resolution fixes.\n" }, { "commit": "7789447bd97c851b7a09623a417300590e5439d5", "tree": "b6b9af75ac663cbb9478bb1bbc782e6f83e7bbd9", "parents": [ "7e683bdaddff77a24a36d420c5782b47795c5ccb", "3d5535cfb7755c20619529649b025c4682013b85" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat Jan 31 00:54:10 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Jan 31 00:54:10 2015 +0000" }, "message": "am 3d5535cf: Merge \"Limited AppCompat support\" into lmp-dev\n\n* commit \u00273d5535cfb7755c20619529649b025c4682013b85\u0027:\n Limited AppCompat support\n" }, { "commit": "7e683bdaddff77a24a36d420c5782b47795c5ccb", "tree": "2537448578e155069c48aad3584089d3c7967ce2", "parents": [ "5c37c8e66227b15d471047e7c4c986cf3c67876a", "1d59871e4e8a3a657dab3931d684706c45630a2f" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat Jan 31 00:54:07 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Jan 31 00:54:07 2015 +0000" }, "message": "am 1d59871e: Merge \"Resource resolution fixes.\" into lmp-dev\n\n* commit \u00271d59871e4e8a3a657dab3931d684706c45630a2f\u0027:\n Resource resolution fixes.\n" }, { "commit": "224e931fed1220f175805fdec71a882649270aa7", "tree": "5e62edf7e8704fb363fa5c61b07a2bb5b9879d4a", "parents": [ "b6864ac6cde109be320e18188209eb8420c585f1" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jan 15 15:35:21 2015 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jan 28 11:32:30 2015 -0800" }, "message": "Limited AppCompat support\n\nChange-Id: I4ac7234c9533b9f47f070335c4cb6ae605d8a89f\n" }, { "commit": "c2d51280395749328b0bb7a283cbc6037606822e", "tree": "5068d4ee5911f4f840b0d1d927f6b32e389abab9", "parents": [ "304f696b34592d0eb75339da91a71864884322c1", "d555cd550d634192e96e3b834f91aa9559a259db" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Jan 23 10:54:44 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 23 10:54:44 2015 +0000" }, "message": "Merge \"Remove superfluous OpenSSL include paths.\" automerge: fe24754\nautomerge: d555cd5\n\n* commit \u0027d555cd550d634192e96e3b834f91aa9559a259db\u0027:\n Remove superfluous OpenSSL include paths.\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": "0e7829e4289aff3601945be0637ba7c8ca100508", "tree": "73fcddf58879b07392835b5ab8ba0fbe8cdc810c", "parents": [ "231df77eff4e31fead0dfadee6ea6ead980b24ea" ], "author": { "name": "Adam Langley", "email": "agl@google.com", "time": "Thu Jan 22 17:15:13 2015 -0800" }, "committer": { "name": "Adam Langley", "email": "agl@google.com", "time": "Thu Jan 22 17:15:13 2015 -0800" }, "message": "Remove superfluous OpenSSL include paths.\n\nThe libcrypto and libssl modules (and their respective static and host\nversions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module\nis sufficient.\n\nChange-Id: I467f1b1d038b5136fa22b1230da134c394eac54e\n" }, { "commit": "d9bd08864eaf9d8847d974eadb81806b9e086a2d", "tree": "7f3f1caed8501f6409955deb27db6fa211fbca62", "parents": [ "a9c122af60621597f1d008c8a283074309383aac", "554a6f5278ec05077d8252249afc911897fbfe76" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Jan 20 21:55:12 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 20 21:55:12 2015 +0000" }, "message": "am aee7225e: Merge \"Process base APK\" into lmp-mr1-dev\nautomerge: 554a6f5\n\n* commit \u0027554a6f5278ec05077d8252249afc911897fbfe76\u0027:\n Process base APK\n" }, { "commit": "42eea270a0a2bc54f454312817c41ac357e3a884", "tree": "36a4b3f3f658c40be17f3ce7c4bc3b6836bc817a", "parents": [ "8d47bc97e642cd0d0caf31d09efe05d8dc233f27" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Jan 15 17:01:39 2015 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Jan 16 14:11:30 2015 -0800" }, "message": "Process base APK\n\nThe base APK may have resources with configurations that compete\nagainst some splits. The base APK must be involved in the selection\nof splits.\n\nBug:18982001\nChange-Id: Ieb29b5a36cf2c68e7831484d98a9fd275acd97e8\n" }, { "commit": "b6864ac6cde109be320e18188209eb8420c585f1", "tree": "01e988af08b9869ffe7f5c1075763030fcdedb45", "parents": [ "10b829e126482c54657371485ecf425b3f05bb0f" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jan 15 15:25:49 2015 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jan 15 15:25:49 2015 -0800" }, "message": "Resource resolution fixes.\n\n1. Some dynamic ids weren\u0027t created and resulted in ResourceNotFound\nexceptions.\n2. Prevent NPE if a style attribute (eg. style\u003d\"?attr/foo\"), which\ncannot be resolved, is resolved. This effectively, also results in\nmaking it harder to catch misconfigured themes. However, support\nlibrary does it, and we don\u0027t want to throw errors when the library is\nworking as intended.\n\nChange-Id: I731d8fb9209eb72b464d235d1072d416e132970b\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": "22230189be8e811881ba24de1cde97f9882a7d45", "tree": "26708c25177d6f429e00d881dea38fac775dc211", "parents": [ "58ade15bcc33fc8d5ade4a26b404c453eedf0cf1", "8e2dd14e7d327f3d92d57092c24ea2064f04fd1c" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat Jan 10 04:14:54 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Jan 10 04:14:54 2015 +0000" }, "message": "am f2e04ac7: am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar.\nautomerge: 8e2dd14\n\n* commit \u00278e2dd14e7d327f3d92d57092c24ea2064f04fd1c\u0027:\n Special case AppCompat to show action bar.\n" }, { "commit": "f2e04ac7ea1cc2f91ca1562a14c7e0c261f869fe", "tree": "8ba72143e11d8b15d2d8a18650ca8d0f91148277", "parents": [ "cd2e4da9a77396554b274cd79f64b37cadfac282", "c598047d67f64e690f682d82c0e77989c79ae465" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat Jan 10 04:04:22 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Jan 10 04:04:22 2015 +0000" }, "message": "am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar.\n\n* commit \u0027c598047d67f64e690f682d82c0e77989c79ae465\u0027:\n Special case AppCompat to show action bar.\n" }, { "commit": "c598047d67f64e690f682d82c0e77989c79ae465", "tree": "f709951ecc8a5c7134c5a2345c339de2ddc70ee4", "parents": [ "20625cce4c13d2337456aaa74ba91b6c4379321f", "ca67a249293d021808f349fa2e2f799451aeafe8" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat Jan 10 03:56:47 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Jan 10 03:56:47 2015 +0000" }, "message": "am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar.\n\n* commit \u0027ca67a249293d021808f349fa2e2f799451aeafe8\u0027:\n Special case AppCompat to show action bar.\n" }, { "commit": "ca67a249293d021808f349fa2e2f799451aeafe8", "tree": "6397585fb82054ea8c2d599137aa38014b451c0f", "parents": [ "c5871ea1b830153e7f85367844bcc67b81a2c06b", "bb600de6e7c5c7a0a1d4b872d2ee100ccc353213" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat Jan 10 03:51:05 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Jan 10 03:51:05 2015 +0000" }, "message": "am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar.\n\n* commit \u0027bb600de6e7c5c7a0a1d4b872d2ee100ccc353213\u0027:\n Special case AppCompat to show action bar.\n" }, { "commit": "bb600de6e7c5c7a0a1d4b872d2ee100ccc353213", "tree": "353cf6359fe1a5b9f7f3d18d97304fa4f3fdd57c", "parents": [ "dbd64f7c904287f9e1bf5bb22385aace85274cab", "74147527357b9abd9d30b3a2dbd72a5172a35625" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat Jan 10 02:16:44 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Jan 10 02:16:44 2015 +0000" }, "message": "am 74147527: am 8505c387: Special case AppCompat to show action bar.\n\n* commit \u002774147527357b9abd9d30b3a2dbd72a5172a35625\u0027:\n Special case AppCompat to show action bar.\n" }, { "commit": "74147527357b9abd9d30b3a2dbd72a5172a35625", "tree": "ecdcfcd12b61d65140a17b14f88c7a9c79774c80", "parents": [ "df878bd3fc63f26e91b055e39ba63c53c14b31a0", "8505c3870a17f41d23329344fe381cd9ff324bd2" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat Jan 10 02:10:55 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Jan 10 02:10:55 2015 +0000" }, "message": "am 8505c387: Special case AppCompat to show action bar.\n\n* commit \u00278505c3870a17f41d23329344fe381cd9ff324bd2\u0027:\n Special case AppCompat to show action bar.\n" }, { "commit": "dbd64f7c904287f9e1bf5bb22385aace85274cab", "tree": "e04e4c421d1a890aeea0a25ee2799179df053771", "parents": [ "51fb7754fc9a232a225b31b37219f4b0dcba6711" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jul 14 15:50:49 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri Jan 09 17:43:12 2015 -0800" }, "message": "Support Locale.toLanguageTag on Java 6\n\nChange-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3\n(cherry picked from commit 5cd9dde5a2a77c5095f985186d8f03147fd22870)\n" }, { "commit": "51fb7754fc9a232a225b31b37219f4b0dcba6711", "tree": "e5b44721534466cb27e3a735c30dda3acc9277f2", "parents": [ "8db769dd56822a59f1997a9cb53ed02d3d1cb8dd" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jul 10 13:20:42 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri Jan 09 17:03:54 2015 -0800" }, "message": "LayoutLib: Fix System.arraycopy()\n\nFramework has specialized versions of java.lang.System.arraycopy() for\nall primitive data types. These versions are not present on the Desktop\nVM. This change replaces calls to any of the specialized versions with\nthe more general alternative - the one using Objects.\n\nNote that this was already being done for char.\n\nChange-Id: If1584125fea8ecc080fb39a5ee6cdb4d922d0c98\n(cherry picked from commit e1960cc0b541cda93db94de5bef42dff922b9ec3)\n" }, { "commit": "8505c3870a17f41d23329344fe381cd9ff324bd2", "tree": "1fd47866c1eba17cda1cfbbfd7b9b64f17316006", "parents": [ "ced2f74ac170439231f189e31538b9f403909966" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jan 08 19:10:07 2015 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat Jan 10 00:29:52 2015 +0000" }, "message": "Special case AppCompat to show action bar.\n\nBug: http://b.android.com/78944\nChange-Id: I02d68d592d812016744716f99376cfefd519b21b\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": "321bf43315ace2f091a54d514dd56902990bec7a", "tree": "ebaa28a801a0121faa271d2054e38252ecdb72d6", "parents": [ "f0da92bfda9a7b393cac87436173c1284c7d48be", "03c822aa585c319fb9cd05f392d8518501cc4f79" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jan 08 01:49:23 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jan 08 01:49:23 2015 +0000" }, "message": "am 2d14feb4: Merge \"Replace java.util.LinkedHashMap.eldest()\" into lmp-mr1-dev\nautomerge: 03c822a\n\n* commit \u002703c822aa585c319fb9cd05f392d8518501cc4f79\u0027:\n Replace java.util.LinkedHashMap.eldest()\n" }, { "commit": "f0da92bfda9a7b393cac87436173c1284c7d48be", "tree": "219acfd8562714c109a2108d3e8a074feecb4dc0", "parents": [ "f45420d0bd912de3da9506bbae12a0e4b789bd84", "33b2de7f34180983fe596ff9faa6955b032fa157" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jan 08 01:47:52 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jan 08 01:47:52 2015 +0000" }, "message": "am 169c11dd: Merge \"Add missing DateFormat method.\" into lmp-mr1-dev\nautomerge: 33b2de7\n\n* commit \u002733b2de7f34180983fe596ff9faa6955b032fa157\u0027:\n Add missing DateFormat method.\n" }, { "commit": "f45420d0bd912de3da9506bbae12a0e4b789bd84", "tree": "1d285a181b8bf6c1f89f1e7ce35e4e6527a90f17", "parents": [ "bcba21827c836e8941719b432fbf11d1bb8e8639", "7e393853656387757da2531d4e504d7cf32e738e" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jan 08 01:46:46 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jan 08 01:46:46 2015 +0000" }, "message": "am 565b6b41: Merge \"Update platform.dir search in tests.\" into lmp-mr1-dev\nautomerge: 7e39385\n\n* commit \u00277e393853656387757da2531d4e504d7cf32e738e\u0027:\n Update platform.dir search in tests.\n" }, { "commit": "2d14feb4c7185008111f3a6340f114a4c891e01c", "tree": "c3112241004019bbcdce95a44fa08dd83cedda18", "parents": [ "169c11dd39ec44364168785a7a83fb747e893c9a", "1330f79f95fd14b53c393402fbcbf7b7bbdcbc60" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jan 08 01:31:54 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 08 01:31:55 2015 +0000" }, "message": "Merge \"Replace java.util.LinkedHashMap.eldest()\" into lmp-mr1-dev" }, { "commit": "169c11dd39ec44364168785a7a83fb747e893c9a", "tree": "cc0f5e45c0620cb009852ac99e58b4265adfb0ab", "parents": [ "565b6b415a18ee0b99af8cb693b980e57136282b", "6aede34e246e03be618c30504fc2fc8b07f23225" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jan 08 01:17:31 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 08 01:17:32 2015 +0000" }, "message": "Merge \"Add missing DateFormat method.\" into lmp-mr1-dev" }, { "commit": "565b6b415a18ee0b99af8cb693b980e57136282b", "tree": "0293e1f8989ce5aba127827ddbec77c2543f1269", "parents": [ "d8e99c5861b09de8f709c9284240e2c3115507bb", "0359b4b19962a4e3c44925907dedb4a9bfd916d0" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jan 08 01:17:22 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 08 01:17:23 2015 +0000" }, "message": "Merge \"Update platform.dir search in tests.\" into lmp-mr1-dev" }, { "commit": "1330f79f95fd14b53c393402fbcbf7b7bbdcbc60", "tree": "89f05af111d935521ca93bb6c021665cf83eae84", "parents": [ "6aede34e246e03be618c30504fc2fc8b07f23225" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jan 07 16:25:59 2015 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jan 07 16:32:21 2015 -0800" }, "message": "Replace java.util.LinkedHashMap.eldest()\n\nProvide an alternate implementation for the above method and replace the\ncalls to it, since the method is not available on host VM.\n\nChange-Id: I329d86b457d1859b137da8fb2790ddd7f8efa788\n" }, { "commit": "5df729ad09b85cb68bdf37d58c5d429c2c8663a4", "tree": "86793c477e5bd8fb24ee82b7e2f20927a0a1c983", "parents": [ "04b30fa00b5ae9c05c307dbfa2ba7d8028402999", "a98a9b30bea74478b9d1b3f16e3713f5c864e648" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jan 08 00:03:58 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 08 00:03:58 2015 +0000" }, "message": "am a98a9b30: am d8e99c58: am 3bd33f1d: Merge \"Fix tests on jenkins, take 2.\" into lmp-dev automerge: 0b1188e\n\n* commit \u0027a98a9b30bea74478b9d1b3f16e3713f5c864e648\u0027:\n Fix tests on jenkins, take 2.\n" }, { "commit": "d8e99c5861b09de8f709c9284240e2c3115507bb", "tree": "3cc6008cd4c2c2a2de8cfdb8abb910c312dfc041", "parents": [ "97b7b8637bc50cbcd9ad9a63fcb34355439b0701", "0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jan 07 23:53:09 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 07 23:53:09 2015 +0000" }, "message": "am 3bd33f1d: Merge \"Fix tests on jenkins, take 2.\" into lmp-dev\nautomerge: 0b1188e\n\n* commit \u00270b1188e3c1ff6c814dc64c51c83b19afa36d8ce9\u0027:\n Fix tests on jenkins, take 2.\n" }, { "commit": "6aede34e246e03be618c30504fc2fc8b07f23225", "tree": "ffdba4b14adc0e64a96482a66f36f0eb5ac64759", "parents": [ "0359b4b19962a4e3c44925907dedb4a9bfd916d0" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jan 07 12:26:31 2015 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jan 07 12:26:31 2015 -0800" }, "message": "Add missing DateFormat method.\n\nChange-Id: Ia03023e65ef4a7ec90b61f1f538cbe74868c63c5\n" }, { "commit": "0359b4b19962a4e3c44925907dedb4a9bfd916d0", "tree": "5fc624b8d7de033793ec5292c35634e27cd7d285", "parents": [ "f61bc8a2624bc70c903238229a62abc3351ed620" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jan 07 12:21:59 2015 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jan 07 12:21:59 2015 -0800" }, "message": "Update platform.dir search in tests.\n\nThe tests search for a built sdk using some heuristics. The default path\nof the built sdk has changed now, and this updates the search\naccordingly.\n\nChange-Id: I36d465d8c5f6cfd971bbdf95878fb144de233c6c\n" }, { "commit": "0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9", "tree": "9e34129dba00354c7e2ab5d57cd43278036d2b89", "parents": [ "0e13957a4deab3a90492d9ae2f6d35d3b5c1773e", "3bd33f1d9e8af826fa95095ca391d40f6c75ca2a" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jan 07 19:46:03 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 07 19:46:03 2015 +0000" }, "message": "am 3bd33f1d: Merge \"Fix tests on jenkins, take 2.\" into lmp-dev\n\n* commit \u00273bd33f1d9e8af826fa95095ca391d40f6c75ca2a\u0027:\n Fix tests on jenkins, take 2.\n" }, { "commit": "d657b149274aeba0561e68f7172907b300d1b452", "tree": "0cb166a4c564a6618250f91886c1886a8551f501", "parents": [ "48603a39d4dd721d231c99e10908f4f00c4ec6b9" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jan 07 11:22:22 2015 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jan 07 11:22:22 2015 -0800" }, "message": "Fix tests on jenkins, take 2.\n\nChange-Id: I67386c34a7abd7c3afdf9f0768f36f4786399be0\n" }, { "commit": "2458f2b12b5ec266538b2019b0f14fca4e772bdf", "tree": "763c65221d89b0ff8bcb2a2dc4c67958d4363ebe", "parents": [ "2c9d203c4a167344bcac8dabf31eae27489214b0", "fa490b78df732f484475e214eec033f89c5b40b7" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jan 07 10:17:51 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 07 10:17:51 2015 +0000" }, "message": "am fa490b78: am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkins\n\n* commit \u0027fa490b78df732f484475e214eec033f89c5b40b7\u0027:\n Fix tests on jenkins\n" }, { "commit": "984823f543b58ff3c064a203762530f972870d64", "tree": "2c1b1b1a6e60f77e2abf8f59361b8784a60f98c5", "parents": [ "bc8b0541d7df2969264587c739e820eab7bbeea1", "7f9582ce616a81b70794d7942b39f8442f5ef9d5" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jan 07 09:23:17 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 07 09:23:17 2015 +0000" }, "message": "am 7f9582ce: am 48603a39: Fix tests on jenkins\n\n* commit \u00277f9582ce616a81b70794d7942b39f8442f5ef9d5\u0027:\n Fix tests on jenkins\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": "7f9582ce616a81b70794d7942b39f8442f5ef9d5", "tree": "76f75512b00390577b2d8474f410099de72556b2", "parents": [ "96f11258ab19962c93b615c00b387bdc05c0d75b", "48603a39d4dd721d231c99e10908f4f00c4ec6b9" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jan 07 01:43:39 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 07 01:43:39 2015 +0000" }, "message": "am 48603a39: Fix tests on jenkins\n\n* commit \u002748603a39d4dd721d231c99e10908f4f00c4ec6b9\u0027:\n Fix tests on jenkins\n" }, { "commit": "48603a39d4dd721d231c99e10908f4f00c4ec6b9", "tree": "904da4721e6419a8867227eea1d0d0c37ab79304", "parents": [ "dc649c8da46dc1cc2ac7df41ddde0f28c64db687" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 17:32:26 2015 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 17:32:26 2015 -0800" }, "message": "Fix tests on jenkins\n\nWhen the tests are run on the build server, they are run from the jar,\nas opposed to the extracted build, which is default when run from an\nIDE. Thus, when class.getResourceAsStream() is called with \"..\" in the\npath, it is not resolved properly. This change explicitly resolves the\nrelative path, so that the test is run properly on the server.\n\nChange-Id: Ib5fabd617dca4052220e5173a8bf4fb4234254ff\n" }, { "commit": "27ce2763325bcb7940232a11892e12fb86053cf7", "tree": "8d8a3a368e1765d561684bd2f82ba850d0fdbae5", "parents": [ "641353b6c28708ec8a5e1eb4143138e5b3e4674b", "e88c120ebf42f5a16565414415fa292f5ef9525b" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 23:00:37 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 06 23:00:39 2015 +0000" }, "message": "Merge \"resolve conflict for 8c831b2f -\u003e lmp-mr1-dev-plus-aosp again\" into lmp-mr1-dev-plus-aosp" }, { "commit": "e88c120ebf42f5a16565414415fa292f5ef9525b", "tree": "67397a71dfdc03078059bc3a3bfc0ac98b9f598b", "parents": [ "a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 14:58:37 2015 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 14:58:37 2015 -0800" }, "message": "resolve conflict for 8c831b2f -\u003e lmp-mr1-dev-plus-aosp again\n\nThe earlier resolution (a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2)\nwasn\u0027t the right one. This fixes it.\n\nChange-Id: I6a6dc908d3e7dd510064a46df932d129a58eed98\n" }, { "commit": "d5455fedaf0a55dfe25cf94d6bbb9ecf6f305725", "tree": "0b3617436348e3e51d9cd7aa56bceab5dcc4713c", "parents": [ "a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2", "aebd7fdb66b41b77a3cf51a7cf6911e8db3c7199" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 22:50:18 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 06 22:50:18 2015 +0000" }, "message": "am aebd7fdb: am 565f2245: am a6671b70: am 6461e054: Merge \"Add image comparison to LayoutLib tests.\" into lmp-dev\n\n* commit \u0027aebd7fdb66b41b77a3cf51a7cf6911e8db3c7199\u0027:\n Add image comparison to LayoutLib tests.\n" }, { "commit": "a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2", "tree": "e5f6633f5e05758f2e1ea584217159b3df366210", "parents": [ "5760f1535b0bb619c72e8d4478fc65283bd89eb7", "8c831b2fc60bf98530684745bdfc57108e694af4" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 14:46:27 2015 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 14:46:27 2015 -0800" }, "message": "resolved conflicts for merge of 8c831b2f to lmp-mr1-dev-plus-aosp\n\nChange-Id: I8894287fd43afc863d070cab04cfaa1bf70f7ebb\n" }, { "commit": "5760f1535b0bb619c72e8d4478fc65283bd89eb7", "tree": "40c8c99a3aa616f2eec65dc05c12fa17fa1470df", "parents": [ "67cf0bf421370c756d93ca52697fbce03e34c09c", "c2e9875dcb173a4965b5c0e6022fc2e81f0a37ef" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 22:36:45 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 06 22:36:45 2015 +0000" }, "message": "am c2e9875d: am 229ce665: am 937db7a3: am 53f73a97: Merge \"Add DatePicker, CalendarView to LayoutLib tests\" into lmp-dev\n\n* commit \u0027c2e9875dcb173a4965b5c0e6022fc2e81f0a37ef\u0027:\n Add DatePicker, CalendarView to LayoutLib tests\n" }, { "commit": "67cf0bf421370c756d93ca52697fbce03e34c09c", "tree": "6c80d658a90415ac81d51ffb08a94ba429c88a49", "parents": [ "adcd224135e3c12f483547ffa8bb2cb0250ba923", "84097e3977c82554aafc2e461cd51d6f5eb03866" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 22:36:39 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 06 22:36:39 2015 +0000" }, "message": "am 84097e39: am b187106c: am e69e4f8b: am f9bb0b5e: Merge \"Fix DatePicker rendering.\" into lmp-dev\n\n* commit \u002784097e3977c82554aafc2e461cd51d6f5eb03866\u0027:\n Fix DatePicker rendering.\n" }, { "commit": "adcd224135e3c12f483547ffa8bb2cb0250ba923", "tree": "ec1b63fc36dfa57390cd0f5d273c0b2bd6c0d6a1", "parents": [ "d050df7275137f9c57ce79a7b46d51e2d1fb9290", "c7fe979303eb924d7fbb9fa342cc5cd7b929c2d2" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 22:36:33 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 06 22:36:33 2015 +0000" }, "message": "am c7fe9793: am 48ab6bec: am 8c686ddd: am d20a518c: Merge \"Make Preference-cookie map non static.\" into lmp-dev\n\n* commit \u0027c7fe979303eb924d7fbb9fa342cc5cd7b929c2d2\u0027:\n Make Preference-cookie map non static.\n" }, { "commit": "d050df7275137f9c57ce79a7b46d51e2d1fb9290", "tree": "fbec19b8280294896e2c7007b57a38ba4fdecae1", "parents": [ "20db87702b816c5f861041626e04590a3058fa5a", "addaeff9b28d833616376f802b7a38e32397edd1" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 22:36:27 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 06 22:36:27 2015 +0000" }, "message": "am addaeff9: am b88a65df: am cec8e5a1: am f861c0ce: Merge \"Fix default initial value for preferences\" into lmp-dev\n\n* commit \u0027addaeff9b28d833616376f802b7a38e32397edd1\u0027:\n Fix default initial value for preferences\n" }, { "commit": "20db87702b816c5f861041626e04590a3058fa5a", "tree": "6803806d11f7a7a4e9c3d1fa6bf49b991777d7de", "parents": [ "6302a72a8d9f3ce53d87c78b24048bc0787547cf", "e15f580b9d7a555bff96efd3cec195b39637e679" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 22:36:21 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 06 22:36:21 2015 +0000" }, "message": "am e15f580b: am 2bd01ebf: am 7ed14549: am 7081a114: Merge \"Add preferences rendering.\" into lmp-dev\n\n* commit \u0027e15f580b9d7a555bff96efd3cec195b39637e679\u0027:\n Add preferences rendering.\n" }, { "commit": "565f2245402f4fe6038942b03b9a35cfc0d48d86", "tree": "ab99a388a041be10b28cd24afac50cfe114c93c3", "parents": [ "86f96d07c7d531d69bab3d402d33eb8f15038eee", "a6671b707446963f402a71219725f317a57b42af" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 22:23:01 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 06 22:23:01 2015 +0000" }, "message": "am a6671b70: am 6461e054: Merge \"Add image comparison to LayoutLib tests.\" into lmp-dev\n\n* commit \u0027a6671b707446963f402a71219725f317a57b42af\u0027:\n Add image comparison to LayoutLib tests.\n" }, { "commit": "86f96d07c7d531d69bab3d402d33eb8f15038eee", "tree": "6e847d1870b12ff58338a54fb6efd80829d76609", "parents": [ "229ce66583a51baabf83fec4d0c42af0d3ecba38", "0db2524caa01022629075a113d3370a1b7c3da30" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 22:22:56 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 06 22:22:56 2015 +0000" }, "message": "am 0db2524c: am b2ebb968: Merge \"Remove Time from CreateInfo\" into lmp-dev\n\n* commit \u00270db2524caa01022629075a113d3370a1b7c3da30\u0027:\n Remove Time from CreateInfo\n" }, { "commit": "229ce66583a51baabf83fec4d0c42af0d3ecba38", "tree": "fee64718aec708471241d1add51e095586b88faa", "parents": [ "b187106c5397072b6ae26061cec847ec9343caee", "937db7a39ef6f5e88a936f78a729f9578123e60b" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 22:22:53 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 06 22:22:53 2015 +0000" }, "message": "am 937db7a3: am 53f73a97: Merge \"Add DatePicker, CalendarView to LayoutLib tests\" into lmp-dev\n\n* commit \u0027937db7a39ef6f5e88a936f78a729f9578123e60b\u0027:\n Add DatePicker, CalendarView to LayoutLib tests\n" }, { "commit": "b187106c5397072b6ae26061cec847ec9343caee", "tree": "b97a4729ebe3f7ebe54cd33e7433f61ca419c99e", "parents": [ "48ab6becea828c0bcaaf79fe930aac31881f59db", "e69e4f8b4db142f024e170cf6faabb36095799b7" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 22:22:49 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 06 22:22:49 2015 +0000" }, "message": "am e69e4f8b: am f9bb0b5e: Merge \"Fix DatePicker rendering.\" into lmp-dev\n\n* commit \u0027e69e4f8b4db142f024e170cf6faabb36095799b7\u0027:\n Fix DatePicker rendering.\n" }, { "commit": "48ab6becea828c0bcaaf79fe930aac31881f59db", "tree": "0ce96b9e4c5d1759818bb982219bd85bdbe32d77", "parents": [ "b88a65df73798becc57004b3fc55fdf8c0a83a13", "8c686ddd540f3a15cdba4893f104c0e8e9af5716" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 22:22:44 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 06 22:22:44 2015 +0000" }, "message": "am 8c686ddd: am d20a518c: Merge \"Make Preference-cookie map non static.\" into lmp-dev\n\n* commit \u00278c686ddd540f3a15cdba4893f104c0e8e9af5716\u0027:\n Make Preference-cookie map non static.\n" }, { "commit": "b88a65df73798becc57004b3fc55fdf8c0a83a13", "tree": "0e53201e19f8dd398ae2be3b628a6ee1809ae8a8", "parents": [ "2bd01ebfa99815d4fb6b4e77754146a22cf66d03", "cec8e5a10de413c733223b8b1cc11b70c6254647" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 22:22:40 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 06 22:22:40 2015 +0000" }, "message": "am cec8e5a1: am f861c0ce: Merge \"Fix default initial value for preferences\" into lmp-dev\n\n* commit \u0027cec8e5a10de413c733223b8b1cc11b70c6254647\u0027:\n Fix default initial value for preferences\n" }, { "commit": "2bd01ebfa99815d4fb6b4e77754146a22cf66d03", "tree": "011f40d5cd52450bfc1b2c7e6872bd0217630d2a", "parents": [ "ebc2872929177c4780c68a0371a44c25f89a4f1f", "7ed145493d3f5bea32c567980f77cc42f613197e" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 06 22:22:36 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 06 22:22:36 2015 +0000" }, "message": "am 7ed14549: am 7081a114: Merge \"Add preferences rendering.\" into lmp-dev\n\n* commit \u00277ed145493d3f5bea32c567980f77cc42f613197e\u0027:\n Add preferences rendering.\n" }, { "commit": "f4d3973c319502fc8aa3e1aa1d7e7502274ea3aa", "tree": "e0eb07371d830835923cd8bc179e9064393b6afa", "parents": [ "d17218e7df24da8a2bcf6e7714dc0151155c3286", "9c8f8ed8a8bee42ee48a27b055b11ace6255d09a" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jan 05 23:36:57 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 05 23:36:57 2015 +0000" }, "message": "am 9c8f8ed8: am 4a5baeae: Merge \"resolved conflicts for a0bc2e7e to lmp-mr1-dev\" into lmp-mr1-dev\n\n* commit \u00279c8f8ed8a8bee42ee48a27b055b11ace6255d09a\u0027:\n resolved conflicts for a0bc2e7e to lmp-mr1-dev\n" }, { "commit": "a6671b707446963f402a71219725f317a57b42af", "tree": "45b4ed2803b6dfaf8f7936d521910d8d45e735e6", "parents": [ "0db2524caa01022629075a113d3370a1b7c3da30", "6461e05420c6f42b0e70134a4e0d2a626161ab74" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jan 05 23:33:18 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 05 23:33:18 2015 +0000" }, "message": "am 6461e054: Merge \"Add image comparison to LayoutLib tests.\" into lmp-dev\n\n* commit \u00276461e05420c6f42b0e70134a4e0d2a626161ab74\u0027:\n Add image comparison to LayoutLib tests.\n" }, { "commit": "0db2524caa01022629075a113d3370a1b7c3da30", "tree": "5a8b3044babdf9d6eb4ee7a431fcbaa600751f5f", "parents": [ "937db7a39ef6f5e88a936f78a729f9578123e60b", "b2ebb9683fb5b21543b50772a0d4c646ced7764b" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jan 05 23:33:14 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 05 23:33:14 2015 +0000" }, "message": "am b2ebb968: Merge \"Remove Time from CreateInfo\" into lmp-dev\n\n* commit \u0027b2ebb9683fb5b21543b50772a0d4c646ced7764b\u0027:\n Remove Time from CreateInfo\n" }, { "commit": "937db7a39ef6f5e88a936f78a729f9578123e60b", "tree": "6286b743585601a27f5101af4ea477ff576d2572", "parents": [ "e69e4f8b4db142f024e170cf6faabb36095799b7", "53f73a97542c277a519b973060dfa217849b66de" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jan 05 23:33:10 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 05 23:33:10 2015 +0000" }, "message": "am 53f73a97: Merge \"Add DatePicker, CalendarView to LayoutLib tests\" into lmp-dev\n\n* commit \u002753f73a97542c277a519b973060dfa217849b66de\u0027:\n Add DatePicker, CalendarView to LayoutLib tests\n" }, { "commit": "e69e4f8b4db142f024e170cf6faabb36095799b7", "tree": "97c58b3086fdf036779046e40f9535864f621e4d", "parents": [ "8c686ddd540f3a15cdba4893f104c0e8e9af5716", "f9bb0b5e133b0c364c3f87623f0fdff0fedc5226" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jan 05 23:33:06 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 05 23:33:06 2015 +0000" }, "message": "am f9bb0b5e: Merge \"Fix DatePicker rendering.\" into lmp-dev\n\n* commit \u0027f9bb0b5e133b0c364c3f87623f0fdff0fedc5226\u0027:\n Fix DatePicker rendering.\n" }, { "commit": "8c686ddd540f3a15cdba4893f104c0e8e9af5716", "tree": "3478676c427f8a18163b32662836653a277fd4fa", "parents": [ "cec8e5a10de413c733223b8b1cc11b70c6254647", "d20a518c82e5e33d33e3dc5d74bf3c17d807f7d7" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jan 05 23:33:02 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 05 23:33:02 2015 +0000" }, "message": "am d20a518c: Merge \"Make Preference-cookie map non static.\" into lmp-dev\n\n* commit \u0027d20a518c82e5e33d33e3dc5d74bf3c17d807f7d7\u0027:\n Make Preference-cookie map non static.\n" }, { "commit": "cec8e5a10de413c733223b8b1cc11b70c6254647", "tree": "8e2022a60384c3ce6d902d5d5c4c13adbcf70821", "parents": [ "7ed145493d3f5bea32c567980f77cc42f613197e", "f861c0ce3ff42550f3d5ede837e7bfb3855f5964" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jan 05 23:32:58 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 05 23:32:58 2015 +0000" }, "message": "am f861c0ce: Merge \"Fix default initial value for preferences\" into lmp-dev\n\n* commit \u0027f861c0ce3ff42550f3d5ede837e7bfb3855f5964\u0027:\n Fix default initial value for preferences\n" }, { "commit": "7ed145493d3f5bea32c567980f77cc42f613197e", "tree": "684a1a7d5c49db5c881839d9abe5f6d112b23115", "parents": [ "e7d1db56324e406a074bf0c44e778060b07d2322", "7081a114d4ee190c746f337057b0f84928c162dd" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jan 05 23:32:53 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 05 23:32:53 2015 +0000" }, "message": "am 7081a114: Merge \"Add preferences rendering.\" into lmp-dev\n\n* commit \u00277081a114d4ee190c746f337057b0f84928c162dd\u0027:\n Add preferences rendering.\n" }, { "commit": "58df125bbc76fd71a9c056c6b6108fc149733b0e", "tree": "844a53c51387e9492f10448dbc5214efdede945a", "parents": [ "4022272a4f714a8d140c09804881ad338964f324" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sun Dec 07 20:48:00 2014 +0530" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jan 05 11:32:41 2015 -0800" }, "message": "Add image comparison to LayoutLib tests.\n\nThe LayoutLib rendering tests now compares the rendered image with a\ngolden file from a previous execution. This will help catch any\nunexpected changes in the final rendering.\n\nChange-Id: I80251a778e89df7d7ec13863a8f299967f3d747d\n" }, { "commit": "4022272a4f714a8d140c09804881ad338964f324", "tree": "ae924814dd60435def117eca419b2499705d2a04", "parents": [ "eae390a94ee63676bc6cbe3b36dbe5bb48e82f6b" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri Jan 02 13:55:20 2015 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri Jan 02 13:55:20 2015 -0800" }, "message": "Remove Time from CreateInfo\n\nTime_Delegate was removed in change with Change-Id:\nIae5ef65678f0e6c7c5af520c45bd15980ce3fa55. But the name wasn\u0027t removed\nfrom CreateInfo. This didn\u0027t cause any problems at runtime, but caused\nthe layoutlib_create tests to fail.\n\nChange-Id: I079b1e024b97d389eb07d4f088fd860efbb02eb3\n" }, { "commit": "eae390a94ee63676bc6cbe3b36dbe5bb48e82f6b", "tree": "0f67de8096b45dad100858095898536f2929b131", "parents": [ "e64a5bd2fb54d84d6fd2119ef831df1eba4185ff" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri Jan 02 11:20:19 2015 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri Jan 02 11:20:19 2015 -0800" }, "message": "Add DatePicker, CalendarView to LayoutLib tests\n\nChange-Id: Ice8c41ff90ccb0ffe90fcbfcccc91ea24225a3d9\n" }, { "commit": "f5b02eb7c43a96d3f70a3ecc81738b0dff86df13", "tree": "549898ece11468385b9372f7254ec2c07f566ccb", "parents": [ "a30fdf790d66e241252c51d7dbdc401e021e51ad" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Nov 18 21:53:47 2014 +0000" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Dec 30 14:07:29 2014 -0800" }, "message": "resolved conflicts for a0bc2e7e to lmp-mr1-dev\n\nThe original change wasn\u0027t properly merged into lmp-mr1-dev because of\nmerge conflicts. This change manually resolves the conflicts. The main\nreason for the conflict was that TimePickerSpinnerDelegate was swapped\nwith TimePickerClockDelegate.\n\nThis change also fixes the typo in the original change which was fixed\nin a subsequent change.\n\nOriginal commit: 12b6d29b7b5592dcfb6e6fd6f0c21a40f37d014a\nfix for typo: cb09bc45c58740af953874f9915306d351fc3d9d\n\nChange-Id: I50bf8c2d86318f632465a38adfad16d1382a9319\n" }, { "commit": "e64a5bd2fb54d84d6fd2119ef831df1eba4185ff", "tree": "c02d85769d2d408880b530a6f3117b9de48be426", "parents": [ "0ff4568ca07c16f2ad4c61872995200115292ecf" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Dec 29 12:05:49 2014 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Dec 29 12:29:16 2014 -0800" }, "message": "Fix DatePicker rendering.\n\n1. Return AccessibilityManager service from context.\n2. Don\u0027t throw an exception if no style specifited in\nobtainStyledAttributes. Specifying no style is valid and it\u0027s supposed\nto use the default theme in that case.\n\nBug: http://b.android.com/82712 and http://b.android.com/79218\nChange-Id: Iba7097f36996e4d6f1e9db778dc73294f2854c79\n" }, { "commit": "0ff4568ca07c16f2ad4c61872995200115292ecf", "tree": "9e202d89d3e568c3bed1fd73e8fdc80f97da7ef3", "parents": [ "dfeffd4c0ae165a3f225b818ef8d6f5d1cb89a2c" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Oct 07 16:25:14 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Dec 23 12:04:30 2014 -0800" }, "message": "Make Preference-cookie map non static.\n\nMoved the map from Preference to View Cookie to BridgeContext. This\nmeans the map need not be static anymore.\n\nNO_SQ: Depends on unsubmitted changes.\nChange-Id: I662513def17bd6ec3a2646c3bec9bf4f9f89fc15\n" }, { "commit": "dfeffd4c0ae165a3f225b818ef8d6f5d1cb89a2c", "tree": "d309fdad95f6e14217e0f35d659621878ba8b47a", "parents": [ "10bb1371dca38b5b59f083ee963f7987da6511f2" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Oct 06 10:52:25 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Dec 23 12:04:30 2014 -0800" }, "message": "Fix default initial value for preferences\n\nNO_SQ: Depends on unsubmitted changes.\nChange-Id: I061cf71f6167d382e9ef060abeb4d5cff83c4104\n" }, { "commit": "10bb1371dca38b5b59f083ee963f7987da6511f2", "tree": "e7510e46158806a04a28162ca5917b226fe45656", "parents": [ "029acc8ee8e40933c62f19d6f7ced43dca10a6ff" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sun Oct 05 14:41:17 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Dec 23 12:04:30 2014 -0800" }, "message": "Add preferences rendering.\n\nNO_SQ: Depends on updating layoutlib-api-prebuilt.jar\nChange-Id: Iae93ab74c478e6f2158e1528467bec9ee2d7ee9b\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": "9c403d8513db5790364e9f5fafca5c6cf896d369", "tree": "58c495a6b6bc3451d2271104c525b962f28e6c50", "parents": [ "940a1e563fd94f912a7322cea8f0a5662b79050f", "43d0e67573e8122d9e75accb00eaa453e2755713" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Dec 04 21:46:26 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 04 21:46:26 2014 +0000" }, "message": "am 43d0e675: am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge \"Ensure that RandomAccessFile is not leaked.\" into lmp-dev\n\n* commit \u002743d0e67573e8122d9e75accb00eaa453e2755713\u0027:\n Ensure that RandomAccessFile is not leaked.\n" }, { "commit": "940a1e563fd94f912a7322cea8f0a5662b79050f", "tree": "3e744313ef25349af8d69d90c96dfe9e8e269d54", "parents": [ "028df22fd774c8a545dedb03124587b7a19e047b", "52a60ff6366a4f5cf1ed9697b7cebd6f9300de2b" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Dec 04 21:46:20 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 04 21:46:20 2014 +0000" }, "message": "am 52a60ff6: am 302a7cc1: am 4628d51a: am 141c7614: Merge \"Fix AnalogClock rendering\" into lmp-dev\n\n* commit \u002752a60ff6366a4f5cf1ed9697b7cebd6f9300de2b\u0027:\n Fix AnalogClock rendering\n" }, { "commit": "028df22fd774c8a545dedb03124587b7a19e047b", "tree": "f9861bdca6299b88ea37a2c64ecc1beec2a70f59", "parents": [ "4921676345a8b15eadb3ca3e72f103e09027cd1e", "c16d1448bb139384cc86d14d9412ffe1a62817c8" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Dec 04 21:46:14 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 04 21:46:14 2014 +0000" }, "message": "am c16d1448: am b2ded18a: Merge \"resolved conflicts for merge of fb30a783 to lmp-mr1-dev\" into lmp-mr1-dev\n\n* commit \u0027c16d1448bb139384cc86d14d9412ffe1a62817c8\u0027:\n Fix typos in previous bugfixes.\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" } ], "next": "7e168ad04a4553c23bca1e9bd427ba6088493908" }