)]}' { "log": [ { "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": "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": "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": "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": "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": "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": "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": "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": "302a7cc13a02863ef2e9d9102df761e92150de65", "tree": "419bf0aa94d2f5e2ebfd887e7b518c2b2100bab1", "parents": [ "b2ded18a84b3b23a76b462644dcd24b3c33f5234", "4628d51a0d01641ca7fe2cf8403ad551ea6f50ce" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Dec 04 07:00:14 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 04 07:00:14 2014 +0000" }, "message": "am 4628d51a: am 141c7614: Merge \"Fix AnalogClock rendering\" into lmp-dev\n\n* commit \u00274628d51a0d01641ca7fe2cf8403ad551ea6f50ce\u0027:\n Fix AnalogClock rendering\n" }, { "commit": "17a6170c62e6f74f2881623a9c16f0b6fea54721", "tree": "9b00a9ffbe17fc54f270ddb8d768d2f0e61a4fc8", "parents": [ "cb09bc45c58740af953874f9915306d351fc3d9d" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri Nov 21 00:53:41 2014 +0000" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Nov 26 12:03:39 2014 +0000" }, "message": "Fix AnalogClock rendering\n\n1. Change calls to java.lang.System.log* since they don\u0027t exist on the\nhost.\n2. Clean up method rewrite mechanism in ReplaceMethodCallsAdapter.\n3. Stub out creation of uninitialized GregorianCalendar.\n4. Memory map the time zone data base file and provide a custom\nimplementation of BufferIterator for use by ZoneInfoDB\n5. Delete unused Time_Delegate\n\nAlso fixed a comment in BridgeAssetManager and an error message in\nFontFamily_Delegate.\n\nBug: http://b.android.com/79160\nChange-Id: Iae5ef65678f0e6c7c5af520c45bd15980ce3fa55\n" }, { "commit": "12b6d29b7b5592dcfb6e6fd6f0c21a40f37d014a", "tree": "321d6a6ceea591567752472836abaece57e5b28f", "parents": [ "2c5cddbd07bb46b22617a362f3af23be7720f9d5" ], "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 Nov 18 22:02:40 2014 +0000" }, "message": "LayoutLib: Stub AM/PM keycodes in Time Picker.\n\nTimePickerSpinnerDelegate doesn\u0027t need to deal with input when running\ninside LayoutLib. So, we just return the keycodes as if it\u0027s running in\nEnglish locale.\n\nBug: http://b.android.com/79189\nChange-Id: Ife0ae91a1e34a8dac379bc1dda1c1c8ed461c164\n" }, { "commit": "2c5cddbd07bb46b22617a362f3af23be7720f9d5", "tree": "a9e8e1984e90cce008f10f87f386af34a470954e", "parents": [ "8657baa06d2efe845cafef571bd9dce627cf5045" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Nov 11 15:21:19 2014 +0000" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Nov 11 15:21:19 2014 +0000" }, "message": "Don\u0027t skip loading object animator.\n\nThis is used by Buttons as part of StateListAnimator.\n\nChange-Id: Id370869e71898d46e11bbd17ad31169c9f9f5274\n" }, { "commit": "796e9b7f9910f2ba8133cdb6f137107585b2e5fa", "tree": "db85df3bd9830e22f22ce69e6ea6ec774f1b511d", "parents": [ "9173c8a2e90a48959dedc9d4aa415482f5014844" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Nov 04 18:19:55 2014 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri Nov 07 22:26:11 2014 +0000" }, "message": "Add primitive shadows support to LayoutLib\n\nThe shadows rendered are not the same as rendered by the framework. The\nmain purpose of the shadows here is let the user know when shadows will\nbe cast.\n\nCurrently rectangular shadows are available in only two intensities. Any\nelevation below 10dp uses one shadow and any elevation over 10 dp uses\nthe other.\n\nAlso, even though the code for arbitrary shapes exist, it doesn\u0027t quite\nwork yet. No shadows are visible when that code is run.\n\nChange-Id: Ie8235ffccf1d3809713f5d8f82afde434817d6b2\n" }, { "commit": "75bf1b1c6af0bc0d09b04292565915fab0e49a30", "tree": "6a771a73fa4dafd20ec33be5b77c72e1780beb5e", "parents": [ "c55eb170cccea10158cedaeccd991b4b97d0036c", "0b42936d860238be9321f05cf70e934f81b94d72" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Oct 29 00:13:53 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 29 00:13:54 2014 +0000" }, "message": "Merge \"Skip loading animations.\" into lmp-dev" }, { "commit": "0b42936d860238be9321f05cf70e934f81b94d72", "tree": "f44b357f91bb992862622cb0ea09d20991163991", "parents": [ "5c0ed74b3886c5765c576e9e427b93c76b37635a" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Oct 28 15:07:25 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Oct 28 15:07:25 2014 -0700" }, "message": "Skip loading animations.\n\nThis is a temporary fix until Path.approximate() is supported.\n\nBug: http://b.android.com/77865\nChange-Id: I28739e58f51fabaaf1dcc1c9be61cd0b17e84eec\n" }, { "commit": "b6444c43094353065f083d1ae6e4617f098a8b2b", "tree": "58819f2468af014503108acc3a31e4ea5c834544", "parents": [ "4a605c6fa0027ee116beb29fbc9625721f0441f0" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Oct 28 11:01:06 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Oct 28 11:11:10 2014 -0700" }, "message": "Fix multiple styles case in resource resolution.\n\nWhen multiple styles are applied to a theme, we only remembered the last\none. This change fixes the issue.\n\nChange-Id: I46490e882edc3eabe522a641c83366234b5bb25d\n" }, { "commit": "908a4f9a4372a9627e821b5800936095b0f0b5b0", "tree": "7ac469f5fd61ffd4c5dab2b04f6fcb4edf97d44b", "parents": [ "562262cc89838529316ff2f3e511c0d876b08677", "4f133894a6e98d8d30557ea42cec92cfb21fa5c9" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Oct 08 17:34:12 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 08 17:34:12 2014 +0000" }, "message": "am 4f133894: Exclude KXmlParser from LayoutLib.\n\n* commit \u00274f133894a6e98d8d30557ea42cec92cfb21fa5c9\u0027:\n Exclude KXmlParser from LayoutLib.\n" }, { "commit": "4f133894a6e98d8d30557ea42cec92cfb21fa5c9", "tree": "857491e20b9b98ce1b37e00347f2fb54ee5bc0e6", "parents": [ "59c04ece5614ffa20e10964a70c5faeafe565aa3" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Oct 07 18:36:57 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Oct 08 10:12:11 2014 -0700" }, "message": "Exclude KXmlParser from LayoutLib.\n\nThe class was incorrectly being included in the LayoutLib.\n\nChange-Id: I3c86662efa068019fe9165f2fc49a00d0a1b7f2d\n" }, { "commit": "11b14e3996d3602155d6a61afb286e5bc0941a1f", "tree": "5e6be348665b76fc059cfdce770bd3a05b88051f", "parents": [ "916a6ea30377730d578692b625b1c18aa9f13564" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat Aug 02 13:16:24 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Oct 08 02:05:05 2014 +0000" }, "message": "LayoutLib: Use ICU\u0027s line break algo. [DO NOT MERGE]\n\nChange-Id: I7e5b0ab7423a72f5a4b0e1163d0a537f0b03ba07\n(cherry picked from commit 760f6394d0f65fbb5365186e8e068d53c506b653)\n" }, { "commit": "039d5849ea3acd011e0c3dc75e1cfa24e0162b49", "tree": "076f861eb5896d394ee529f271f689250e8a827f", "parents": [ "6fb5fdc23364f922cb2c554f52b6927925d1fb15" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Sep 08 18:38:57 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Oct 01 12:44:05 2014 -0700" }, "message": "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]\n\nLayoutLib Create tests are now built whenever LayoutLib create is built.\n\nChange-Id: Id215e8690e435019579dba1734090a0d585f37e1\n(cherry picked from commit 4efe6264f1251fa200427f54ea6f5dd4c4d03665)\n" }, { "commit": "6fb5fdc23364f922cb2c554f52b6927925d1fb15", "tree": "752786265e796ffed1e5a57870a3ff25e0d51ca3", "parents": [ "bd4133133a55d0cf6a36bb39e89cfd09078d01e9" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Sep 04 19:07:40 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Oct 01 12:43:52 2014 -0700" }, "message": "Add layoutlib tests to DIST_DIR [DO NOT MERGE]\n\nAdd the layoutlib and layoutlib-create tests to DIST_DIR for sdk\ntargets. These can be used for continuous testing on the build server.\n\nChange-Id: I747dddcddfd8009937668bec4d75cb99bf63235f\n(cherry picked from commit f9c749c9901c459f77ffc6f4fbbc15f4142c6e0a)\n" }, { "commit": "bd4133133a55d0cf6a36bb39e89cfd09078d01e9", "tree": "7054cb10e1827b86a455a03b776a887b19bf9004", "parents": [ "3f0e467a0627b435493e5f45d672421bfb931c22" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Sep 03 12:57:12 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Oct 01 12:43:43 2014 -0700" }, "message": "Build layoutlib_create tests. [DO NOT MERGE]\n\nChange-Id: Ia13a090f8ec29b2b2a107825b6a13d7db77e6d61\n(cherry picked from commit 2294f939bc79ce902a40db37def64cc28394d56b)\n" }, { "commit": "b6a37d897aca9d09a09d5c4fa9e60f6f43d6a166", "tree": "6027e80c5f18c386cef5652b355c2012f98951a7", "parents": [ "23f09423cb2cb59333d2f410e89534f0a08ac424" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jul 31 11:32:25 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Oct 01 12:43:11 2014 -0700" }, "message": "Add testing framework to LayoutLib. [DO NOT MERGE]\n\nThis change adds an end to end test which loads the framework resources\nand a test app and ensures that no exceptions or warnings are thrown.\n\nThe change also adds project configuration for intelliJ.\n\nChange-Id: I7b67c0f1a2af2dac95df7f3231cab537b9826d7d\n(cherry picked from commit a8e9517470869fa29946ae1fa1ceeb24c7970391)\n" }, { "commit": "8f92d92a0992456b56f3d552531129c787db7a08", "tree": "16ae30604048dd80d01a44e0e7f66b27b305fb67", "parents": [ "592b95901ef3fa7248bb9b79d8ea9ce3df9628bc" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Sep 08 18:38:57 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Sep 08 18:38:57 2014 -0700" }, "message": "Build layoutlib create tests as part of sdk build.\n\nLayoutLib Create tests are now built whenever LayoutLib create is built.\n\nChange-Id: Id215e8690e435019579dba1734090a0d585f37e1\n" }, { "commit": "a0904bf7aa0ec7a954b5740c67bd922171c72ca1", "tree": "92a2172eb06569a25df77bb0f374878861bbbb37", "parents": [ "f2f3bde62fd9738e1a5b7bd250aec3569cbb14c1" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Sep 04 19:07:40 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri Sep 05 14:01:27 2014 -0700" }, "message": "Add layoutlib tests to DIST_DIR\n\nAdd the layoutlib and layoutlib-create tests to DIST_DIR for sdk\ntargets. These can be used for continuous testing on the build server.\n\nChange-Id: I747dddcddfd8009937668bec4d75cb99bf63235f\n" }, { "commit": "b988c8fa66f35a3f046ee9066ed0dc0f2b4c495b", "tree": "b9ec9d2385241d1ef5ef9e53b9290a54af501341", "parents": [ "c0dce273a8af0263b660b57c1a05395a0bd2d2e5" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Sep 03 12:57:12 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Sep 03 12:57:12 2014 -0700" }, "message": "Build layoutlib_create tests.\n\nChange-Id: Ia13a090f8ec29b2b2a107825b6a13d7db77e6d61\n" }, { "commit": "6ebeefa04cb3c360d8028eb77e60bacf8a800cb1", "tree": "47ddc05482de9b916c1d840f466f4c471567043a", "parents": [ "4881578e6ccd8b51606750e3fd4e20b2204287c7", "904d77118bab63139174470ef728ca9a53e75a15" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 22:51:47 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 06 22:51:47 2014 +0000" }, "message": "am 904d7711: am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs\n\n* commit \u0027904d77118bab63139174470ef728ca9a53e75a15\u0027:\n Fix SystemProperties in LayoutLib.\n" }, { "commit": "7b561be3a6fedebfce412cecd8c36d6686f6576c", "tree": "c030bef5bff5e0fed885dadffbaa04c4bb0a94fa", "parents": [ "b86675f14bea0c833f0ac3f0ec4d3e5f46784569", "09c3c2edb2391d3ffed9a07ec360b9f75b9f7637" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 22:37:10 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 06 22:37:10 2014 +0000" }, "message": "am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs\n\n* commit \u002709c3c2edb2391d3ffed9a07ec360b9f75b9f7637\u0027:\n Fix SystemProperties in LayoutLib.\n" }, { "commit": "db94ea9ed03dbaa0ca075a433a986d7e414e8f8d", "tree": "a77ce10b5515d365a802ecbed6c5a0f0ca880277", "parents": [ "14a4e69cc656b60c705d2f05229aed2a7049693c", "f970d2c201649843b8d51d094b865f16b15bc0bc" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 22:21:54 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 06 22:21:54 2014 +0000" }, "message": "am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs\n\n* commit \u0027f970d2c201649843b8d51d094b865f16b15bc0bc\u0027:\n Fix SystemProperties in LayoutLib.\n" }, { "commit": "f970d2c201649843b8d51d094b865f16b15bc0bc", "tree": "75615ab15cbbba19cfe1e23ec5554cf9c3b0e08f", "parents": [ "c735197420948ffff757dbe6d00028a87ed09c15", "79c3f678d21f6b3c058623217cbe5dd57a553fe8" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 22:18:04 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 06 22:18:04 2014 +0000" }, "message": "am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs\n\n* commit \u002779c3f678d21f6b3c058623217cbe5dd57a553fe8\u0027:\n Fix SystemProperties in LayoutLib.\n" }, { "commit": "72cf03a27a73e91d4a3eabf74e0384b310f4a5b2", "tree": "daedb43ca33e5c9cf2aebc4cf0fff80019530247", "parents": [ "8c71ff298b10ebdd3e5dec6f69f70176161b7e0a", "3a544a81b3d2d529b2995f4b5db2077760d440b5" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 22:05:38 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 06 22:05:38 2014 +0000" }, "message": "am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs\n\n* commit \u00273a544a81b3d2d529b2995f4b5db2077760d440b5\u0027:\n Fix SystemProperties in LayoutLib.\n" }, { "commit": "3a544a81b3d2d529b2995f4b5db2077760d440b5", "tree": "daa0050d5d06ebaef98aafc265738a731b6a54fb", "parents": [ "87234e8544370d86b305fc55d6a5021c38b65495", "a232a68d4ccf2960350adff6af99a52bde2b021d" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 15:00:14 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 15:00:14 2014 -0700" }, "message": "resolved conflicts for merge of a232a68d to jb-mr1.1-docs\n\nChange-Id: I1ea220e3e0a81880db68abab87beab56dc4a336c\n" }, { "commit": "a232a68d4ccf2960350adff6af99a52bde2b021d", "tree": "0426f2e5c60e22976a032f1a7c9ae47c202dc76e", "parents": [ "9c48ab82084828087c47086f2379b4927ec057e2", "5476cfee6b8b5e17a7fa72bb141ca95ef913a4f5" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 14:41:02 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 14:41:02 2014 -0700" }, "message": "resolved conflicts for merge of 5476cfee to jb-mr1-dev\n\nChange-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4\n" }, { "commit": "5476cfee6b8b5e17a7fa72bb141ca95ef913a4f5", "tree": "894b431b98faac08fc3df1dbfa1fd991f999b188", "parents": [ "ccf7b2aac600b6069f03f7f420872b64cc5e6726", "505c675c3a536ac7c6ad264eb62542537532119c" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Aug 06 21:28:24 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 06 21:28:24 2014 +0000" }, "message": "am 505c675c: Fix SystemProperties in LayoutLib.\n\n* commit \u0027505c675c3a536ac7c6ad264eb62542537532119c\u0027:\n Fix SystemProperties in LayoutLib.\n" }, { "commit": "505c675c3a536ac7c6ad264eb62542537532119c", "tree": "8d6bd1171d9ef49510a963ee4a1ff6756bd76a17", "parents": [ "5af7324ace4f318d7395b680beabec7a0f0e39b3" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Aug 05 17:33:35 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Aug 05 17:47:30 2014 -0700" }, "message": "Fix SystemProperties in LayoutLib.\n\nNot all System Properties were used via Build class. Also, properties\nlike SDK_INT which called SystemProperties directly were not initialized\nproperly.\n\nThis change is essentially cherry picking of the relevant parts from the\nfollowing commits:\n984749bf75c9ce9d3401b8410ea7d6276544b6ee\n167bc25bceea9280bbe4858db4cb8233f86ce325\n\nBug: http://b.android.com/73046\nChange-Id: Ia0fb467ee6d5fdedda500d57d02be20006f115df\n" }, { "commit": "0c5cd96522bae516a43d79d9014e93bca4727785", "tree": "6dc87e871b3f57425db547c94dae529899a2df9b", "parents": [ "45aab0eb8f479b9967e7c3c43d0342412fb49b57" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat Aug 02 13:31:30 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Aug 05 21:13:00 2014 +0000" }, "message": "Add SystemProperties native method implementations.\n\nBug: http://b.android.com/73046\nChange-Id: Ia695e7beb81f426509b646cfd929201f7e0a4ade\n" }, { "commit": "45aab0eb8f479b9967e7c3c43d0342412fb49b57", "tree": "4da893b6644a431efdc30df573865db0594cd47f", "parents": [ "01e840ff9441e005153d799e71d65b38bcb21902" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat Aug 02 13:16:24 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Aug 05 21:12:16 2014 +0000" }, "message": "LayoutLib: Use ICU\u0027s line break algo.\n\nChange-Id: I7e5b0ab7423a72f5a4b0e1163d0a537f0b03ba07\n" }, { "commit": "b80e42f93ff26984c410da0235dd10f463e5722a", "tree": "a4f9002f278354c8ec7abd8ffff4860f72e4ab37", "parents": [ "1840e8f2c73570e7b51c66c03d3a50bd00f3f742" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jul 31 14:32:34 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Aug 04 23:02:02 2014 +0000" }, "message": "Replace more Locale methods.\n\nThis change replaces some methods of java.util.Locale. Some of them were\nadded in 1.7 and some are not present in the Desktop VM.\n\nChange-Id: Ifdf8451bb2acf55e01dce8b5e15c40c8160107cc\n" }, { "commit": "d2a411840c58eaee05499bab0190e3f3656e2e84", "tree": "686047bed8ef4cf9417b6f4f615c925ae5162a24", "parents": [ "86eb8b4e29b1ad889fc814bae723d4d6e491f53f" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jul 30 18:27:14 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Aug 04 22:59:38 2014 +0000" }, "message": "Fix LayoutLib Create tests.\n\nChange-Id: Ica3efe417d54da7dc74b21d28215199d37600744\n" }, { "commit": "86eb8b4e29b1ad889fc814bae723d4d6e491f53f", "tree": "6288e70c680adaa54cfec66e00c8a3f8d988bcf2", "parents": [ "b99b18e78e8aa9a27596c13ea05a188ab43c7e12" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jul 31 11:32:25 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Aug 04 22:58:39 2014 +0000" }, "message": "Add testing framework to LayoutLib.\n\nThis change adds an end to end test which loads the framework resources\nand a test app and ensures that no exceptions or warnings are thrown.\n\nThe change also adds project configuration for intelliJ.\n\nChange-Id: I7b67c0f1a2af2dac95df7f3231cab537b9826d7d\n" }, { "commit": "72c60ab7d487c487806f0f20564693c2264fc99d", "tree": "b176ecda9d48c1334e8d8c194c047dc2da9edcee", "parents": [ "8db80b674201f18062f06f95e6ff10e14d16971c" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Jul 30 22:08:48 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jul 31 05:10:03 2014 +0000" }, "message": "Fix classpath for AndroidLocale\n\nChange-Id: I9af9ac05ec26f12529d51e566bf38789a2579390\n" }, { "commit": "f5fbff9b1aeb3abb94b7ee45f989b965424ee43f", "tree": "81c8866faa49da3c92bde05d0fe557af71974a5b", "parents": [ "c54100d449e30919db4879d52ee2cc25942b44d5" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jun 09 18:57:18 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jul 21 17:38:00 2014 -0700" }, "message": "LayoutLib: Fix EditText rendering [DO NOT MERGE]\n\nFramework has overloaded java.lang.System.arraycopy() for char[]. The\nmethod is not present on the Desktop VMs. This change replaces the calls\nto this method by its more general alternative - the one using Objects.\n\nTODO: Make it more configurable and flexible to allow rewrite of any\nsuch methods in the future.\n\nChange-Id: I6823b13e52b1c555eb257d02b79707d84e73236f\n(cherry picked from commit fc3e93300733b4a161adb9cceebea6cda353d085)\n" }, { "commit": "c54100d449e30919db4879d52ee2cc25942b44d5", "tree": "b7200e5f029aceb51ff22581411f6760599a8b14", "parents": [ "643fa8d1ecf5d2a485b7b30d43a47d090b5e3dcc" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Apr 08 16:16:43 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jul 21 17:37:20 2014 -0700" }, "message": "Update layoutlib create README [DO NOT MERGE]\n\nUpdate the doc to reflect the current state of the tool and use a\nconsistent 100 char column limit.\n\nChange-Id: I64fb58cc46abbc2f3759cb1f99d42b5090c1409f\n(cherry picked from commit 88585f404cb493129847e4487b628062674a4ede)\n" }, { "commit": "5cd9dde5a2a77c5095f985186d8f03147fd22870", "tree": "de571251d8be1d3b2ee697e7b3a4b6df0490de6a", "parents": [ "39b88cdb35e11e60d8dbe4924fc2b9fbce3c595d" ], "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": "Tue Jul 15 12:56:04 2014 -0700" }, "message": "Support Locale.toLanguageTag on Java 6\n\nChange-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3\n" }, { "commit": "c5a58437e62698f34abde93ec785c4cbe36aec2d", "tree": "7230366b8f2bc4377c8ecfd622c9d267824a3cd1", "parents": [ "26e32ea559da98dcdebaefb74d4f3c1a5ce705c3" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Jul 10 16:16:29 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri Jul 11 21:40:46 2014 +0000" }, "message": "Style improvements to LayoutLib create.\n\nThis change doesn\u0027t change the functionality but removes dead code and\nsimplifies various places to remove warnings.\n\nChange-Id: I371e06bfbd587dbf0eeafc69787b9805f7008f62\n" }, { "commit": "e1960cc0b541cda93db94de5bef42dff922b9ec3", "tree": "32ecc78616245156d087263dad3de05728e5d5b4", "parents": [ "ca249dc6342a7c6678ca3b7f1dabe0e32d3d902e" ], "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 Jul 11 10:27:36 2014 -0700" }, "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" }, { "commit": "3c989eaa0af6e3c4427af4119cf4949b1f05dba2", "tree": "7c1c454c433bb94e9693f6bc9dc211a58eea56f9", "parents": [ "fe2a71bb13d65a2e8d6bcc60e6bda181029c78a0" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jun 24 18:16:33 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jul 01 12:22:13 2014 -0700" }, "message": "Add VMRuntime_Delegate\n\nFramework now uses libart which moved the implementation of\nnewUnpaddedArray() to native. This copies over the implementation of the\nmethod from libdvm to restore the old behaviour.\n\nChange-Id: Ic062aeb01f9ea52b6ed35517f742058d0ba8c804\n" }, { "commit": "1160e6d2f7018117b0c29a7e2adba9ece36faec1", "tree": "a18723ef2987cd7335539f994e53f0068ba681b2", "parents": [ "6d7a25f317be60ae8a4d8806e517052be2398753" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Jun 09 18:57:18 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jun 10 17:44:14 2014 -0700" }, "message": "LayoutLib: Fix EditText rendering\n\nFramework has overloaded java.lang.System.arraycopy() for char[]. The\nmethod is not present on the Desktop VMs. This change replaces the calls\nto this method by its more general alternative - the one using Objects.\n\nTODO: Make it more configurable and flexible to allow rewrite of any\nsuch methods in the future.\n\nChange-Id: I6823b13e52b1c555eb257d02b79707d84e73236f\n" }, { "commit": "baef8c1ffe5c900fb0da9512654bf249b5fc9269", "tree": "d407f1e4f160cae5eb0b4d1c1bbaeb189d686b50", "parents": [ "80962666b88d4cba9eaf53832040651ce1766ec2" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon May 19 16:14:23 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 27 18:01:34 2014 -0700" }, "message": "Layoutlib fixes for L [DO NOT MERGE]\n\nThis adds the new delegates that were missing. This starts the work on\nchanges related to Minikin Fonts.\n\nThere are some changes related to TypedArray that still need to be\nfixed.\n\nChange-Id: Ic2397b64aa3f1f48926e849b14689c47d9ee7f8c\n(cherry picked from commit 7ca3612094270183243938e79337c84effea7ad0)\n" }, { "commit": "6376c407d433c91174e4cef735ddb0014461a906", "tree": "f6c8dbb568961442db4232feb789be5596b65dfd", "parents": [ "4a644e390359a1715c88f54ed0174ffb5113d617" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu May 15 09:30:11 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu May 15 09:30:11 2014 -0700" }, "message": "Layoutlib: Update delegates for L\n\nUpdate delegate method signatures for L.\n\nChange-Id: Ie607293bcae60b2d3a61d1cad3ac5f04bda2a238\n" }, { "commit": "425645c738f200b44d0c9344ec286562a841d155", "tree": "421cae1b515b99d073dba6515da34f6c7433cd02", "parents": [ "3144fde70f16a11a004dc95ca6f6f0f61db57638", "567f948b60e9a647610454745b0629c136d492db" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 18:15:58 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 18:15:58 2014 +0000" }, "message": "am 567f948b: am 872a5a1a: am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev\n\n* commit \u0027567f948b60e9a647610454745b0629c136d492db\u0027:\n Fix CalendarView to show the right labels. [DO NOT MERGE]\n" }, { "commit": "70efbad0648eb96e9becbd0529cc1f34b6ffb986", "tree": "7a4dc4d09bd4860ced1707981a6fa8512841e268", "parents": [ "8bf73eae6c98532c8a597b885b948b9878555441", "bd5a3e6510e83b161a0e40c191d349524ae4a8e6" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:58:17 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:58:17 2014 +0000" }, "message": "am bd5a3e65: am 1677a9bd: Merge \"resolve conflicts for merge 5a7b3b65 correctly\" into jb-dev-plus-aosp\n\n* commit \u0027bd5a3e6510e83b161a0e40c191d349524ae4a8e6\u0027:\n resolve conflicts for merge 5a7b3b65 correctly\n" }, { "commit": "bd5a3e6510e83b161a0e40c191d349524ae4a8e6", "tree": "108b74a37137a498820c0aaa7d6d4f9c35186b61", "parents": [ "0ad4f2cedde037c2b09a7f09c5f95f0984267c64", "1677a9bdeba3961625236925e754920fca1b7e89" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:53:55 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:53:55 2014 +0000" }, "message": "am 1677a9bd: Merge \"resolve conflicts for merge 5a7b3b65 correctly\" into jb-dev-plus-aosp\n\n* commit \u00271677a9bdeba3961625236925e754920fca1b7e89\u0027:\n resolve conflicts for merge 5a7b3b65 correctly\n" }, { "commit": "5fc8f945ee6a763b08e47019319432ec71ba1d1a", "tree": "1629b381d37037c68755d90861a8b41d13113a58", "parents": [ "3271adea10a7a35d4fe852801794038f01e371be", "b0f2ded5e9e84fb51ec5b2cb6b419b040b008276" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:45:43 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:45:43 2014 +0000" }, "message": "am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev\n\n* commit \u0027b0f2ded5e9e84fb51ec5b2cb6b419b040b008276\u0027:\n Fix CalendarView to show the right labels. [DO NOT MERGE]\n" }, { "commit": "9ddb073bf72d9ca587ecc626dcc9721dd33447c9", "tree": "80a3b4c13ba476ff76c868ae4d709c3280b7422d", "parents": [ "5974d229f9af39df149c8b0c4081826f9a65ce8c", "c70ce72a986f029c9f8c43b4060001624176068d" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:29:13 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:29:13 2014 +0000" }, "message": "am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev\n\n* commit \u0027c70ce72a986f029c9f8c43b4060001624176068d\u0027:\n Fix CalendarView to show the right labels. [DO NOT MERGE]\n" }, { "commit": "c70ce72a986f029c9f8c43b4060001624176068d", "tree": "2e9d60ea3e493395559cbfc541151c31b9077c53", "parents": [ "0cbfde12fde85713f87d8c5ac0cc137c143dfd27", "af9fde9680922f072981a4853e37ccfcf974920a" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:24:10 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:24:10 2014 +0000" }, "message": "am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev\n\n* commit \u0027af9fde9680922f072981a4853e37ccfcf974920a\u0027:\n Fix CalendarView to show the right labels. [DO NOT MERGE]\n" }, { "commit": "cc9e359699e9464ac8a8d6bbd4f12c23a0009d3c", "tree": "135bb6a55060169f2fe44a14bcd8010bd97ba6ae", "parents": [ "7ef276450f3157cc68f714b0d5805319e6f4c555", "5280c911d81a7db5ec8854850bef60d8b0951358" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:14:17 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:14:17 2014 +0000" }, "message": "am 5280c911: am 0df5ae65: am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE]\n\n* commit \u00275280c911d81a7db5ec8854850bef60d8b0951358\u0027:\n Add view cookies for action bar menus. [DO NOT MERGE]\n" }, { "commit": "8e015b7ba46b18a4a0741be7d64f389433c79230", "tree": "169eeaeaae71f8c9c997c77040aad5d98978dff7", "parents": [ "0f26b5102574f0a989023485f4d63a9ac50107d2", "a5461ebfaebf3337a0cf1c752334f23de145a6d1" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:14:09 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:14:09 2014 +0000" }, "message": "am a5461ebf: resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev\n\n* commit \u0027a5461ebfaebf3337a0cf1c752334f23de145a6d1\u0027:\n Action bar rendering in layoutlib [DO NOT MERGE]\n" }, { "commit": "5280c911d81a7db5ec8854850bef60d8b0951358", "tree": "482b9305e61b1e1c5b52380ab32cfc842d568226", "parents": [ "f192096a137ea0a789b2adca2111742beccb4533", "0df5ae65a91174c99d1af633b45b3a1a7861cd1c" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:11:26 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:11:26 2014 +0000" }, "message": "am 0df5ae65: am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE]\n\n* commit \u00270df5ae65a91174c99d1af633b45b3a1a7861cd1c\u0027:\n Add view cookies for action bar menus. [DO NOT MERGE]\n" }, { "commit": "a43aaf00b583e8a88681cdcc6ebe1ae2c52f6f20", "tree": "164d3fdc2fa10acd8dac0fc46956aad712ab07cc", "parents": [ "888461c801b531f31b2ef34617d333d781d93010", "9c00e6739c3d0a11a714a0f654b893531b0f1c5d" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 09:49:18 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 09:49:18 2014 -0700" }, "message": "resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev\n\nChange-Id: I4ab1b0a71b99692458efc3a67c8a8da3690afb7b\n" }, { "commit": "a5461ebfaebf3337a0cf1c752334f23de145a6d1", "tree": "782c3d3179416b3ef5f3743b2e07477dcd402220", "parents": [ "9053261a5413f401168d25fa4a9749723b232949", "6d3c4ab2456a30c5517f4ad6fb8df8d64c517beb" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 09:40:35 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 09:40:35 2014 -0700" }, "message": "resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev\n\nChange-Id: I5c4634897882deb663f32d8148202d7c9189521d\n" }, { "commit": "0f26b5102574f0a989023485f4d63a9ac50107d2", "tree": "e3a997e34fc97841d0c7b39c5587b360623329c1", "parents": [ "727ad35081570c30f9b9ecde84d309a82b653856", "9053261a5413f401168d25fa4a9749723b232949" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:36:56 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:36:56 2014 +0000" }, "message": "am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n\n* commit \u00279053261a5413f401168d25fa4a9749723b232949\u0027:\n Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n" }, { "commit": "727ad35081570c30f9b9ecde84d309a82b653856", "tree": "131aae5cc2edf122d3939447765ca1ca061122e0", "parents": [ "627cab1257bbd80e74ad5db1963aeedbe056b462", "5594616c4f4513dc97b08d6cabb6fd7127dde131" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:36:53 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:36:53 2014 +0000" }, "message": "am 5594616c: am 9602fc1c: am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n\n* commit \u00275594616c4f4513dc97b08d6cabb6fd7127dde131\u0027:\n Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n" }, { "commit": "8a4f39351f5784c81501462fc84d6fe199bdedca", "tree": "6539e12fcaf80fb9b1c3f8a691993611c7c24be3", "parents": [ "838e54826bbb03cec41684340c63be993d2dc160", "48bf7b49bb361a4084e5fb4c6d0ae497a606c700" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:36:36 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:36:36 2014 +0000" }, "message": "am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]\n\n* commit \u002748bf7b49bb361a4084e5fb4c6d0ae497a606c700\u0027:\n Add methods for Time_Delegate [DO NOT MERGE]\n" }, { "commit": "5f61e9b4ef31274f64965cf676757c84b368a2f1", "tree": "b6bdf7cbb760f851d357999cdd6661a6d2bbe586", "parents": [ "520f585bc6409b5c0024105a46b282245dad42e0", "ed98abecad359ab1765ac1f698c8ba06dbd00745" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:36:28 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:36:28 2014 +0000" }, "message": "am ed98abec: am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp\n\n* commit \u0027ed98abecad359ab1765ac1f698c8ba06dbd00745\u0027:\n Remove references to non-std Java classes. [DO NOT MERGE]\n" }, { "commit": "9053261a5413f401168d25fa4a9749723b232949", "tree": "638872007433cb85636a63967ee0ab7b2a33212d", "parents": [ "5594616c4f4513dc97b08d6cabb6fd7127dde131", "052e0c589e5cf714ca71bc8d7b3ce8b3f6c4cb96" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:32:02 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:32:02 2014 +0000" }, "message": "am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n\n* commit \u0027052e0c589e5cf714ca71bc8d7b3ce8b3f6c4cb96\u0027:\n Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n" }, { "commit": "5594616c4f4513dc97b08d6cabb6fd7127dde131", "tree": "dc083559200ed506e13c56a41400952d6924ff1e", "parents": [ "45693e50ecdae9b456e4974dd91758f9e25df2b4", "9602fc1c00e5e5cdf26cdc3fe22022ffcd115361" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:31:59 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:31:59 2014 +0000" }, "message": "am 9602fc1c: am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n\n* commit \u00279602fc1c00e5e5cdf26cdc3fe22022ffcd115361\u0027:\n Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n" }, { "commit": "48bf7b49bb361a4084e5fb4c6d0ae497a606c700", "tree": "fbcf8e613416dc4ee49e326a97b0e13776cba780", "parents": [ "94d33cfce1f32af4480f941fdd6c9942bb203d2c", "69b3115e1c02f2b22165b93bd9bcc5c90ec69b12" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:31:38 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:31:38 2014 +0000" }, "message": "am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]\n\n* commit \u002769b3115e1c02f2b22165b93bd9bcc5c90ec69b12\u0027:\n Add methods for Time_Delegate [DO NOT MERGE]\n" }, { "commit": "ed98abecad359ab1765ac1f698c8ba06dbd00745", "tree": "14fdb73afd336b58ab0d1fc79c5207146ec2eb2b", "parents": [ "2cbe100a9bc6d2b3bf828432a1527f0ac239e575", "8a70bcef5a724906e3c35c58cb2266ee9c9e1b78" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:31:28 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:31:28 2014 +0000" }, "message": "am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp\n\n* commit \u00278a70bcef5a724906e3c35c58cb2266ee9c9e1b78\u0027:\n Remove references to non-std Java classes. [DO NOT MERGE]\n" }, { "commit": "9c00e6739c3d0a11a714a0f654b893531b0f1c5d", "tree": "73f9dd29691004bc36ce190c91c8487de109b53b", "parents": [ "1103ece28c695fc26fcee812870c553dca8d840d", "2fb139e02c1e9d2d7c92acf813445a063e73d94f" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:31:05 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:31:05 2014 +0000" }, "message": "am 2fb139e0: resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev\n\n* commit \u00272fb139e02c1e9d2d7c92acf813445a063e73d94f\u0027:\n Fix CalendarView to show the right labels. [DO NOT MERGE]\n" }, { "commit": "1677a9bdeba3961625236925e754920fca1b7e89", "tree": "0a7bf884bd82cf61ba77199a0aac6b633716d8c6", "parents": [ "7377c7be6abcb3bccabb6cdf2af0ecfed355606c", "51cce0ec42a04f94569e8da544b02c888b82b31d" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:32:30 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 13 02:32:31 2014 +0000" }, "message": "Merge \"resolve conflicts for merge 5a7b3b65 correctly\" into jb-dev-plus-aosp" }, { "commit": "51cce0ec42a04f94569e8da544b02c888b82b31d", "tree": "e9c3761ff25df2b3789075d7d81f010c25f3be10", "parents": [ "8a70bcef5a724906e3c35c58cb2266ee9c9e1b78" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon May 12 19:31:25 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon May 12 19:31:25 2014 -0700" }, "message": "resolve conflicts for merge 5a7b3b65 correctly\n\nChange-Id: I832b7ee50002bcd1429bf431cc91f12e60d19f84\n" }, { "commit": "0df5ae65a91174c99d1af633b45b3a1a7861cd1c", "tree": "54411e8b9159957421c80955cb29ca1d00a2c70f", "parents": [ "175851600c7757c73f91d1be0f960de157228b1c", "0f209967bfc4a6f1eec46cc34a39cfe8af9f8af9" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:20:42 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:20:42 2014 +0000" }, "message": "am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE]\n\n* commit \u00270f209967bfc4a6f1eec46cc34a39cfe8af9f8af9\u0027:\n Add view cookies for action bar menus. [DO NOT MERGE]\n" }, { "commit": "6d3c4ab2456a30c5517f4ad6fb8df8d64c517beb", "tree": "aace13b85ee8e5dcd4aa23b5bde392a8b8be3abc", "parents": [ "052e0c589e5cf714ca71bc8d7b3ce8b3f6c4cb96", "43b15371f9f1da7d97fe0500eb1536d981097e31" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:20:23 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:20:23 2014 +0000" }, "message": "am 43b15371: Action bar rendering in layoutlib [DO NOT MERGE]\n\n* commit \u002743b15371f9f1da7d97fe0500eb1536d981097e31\u0027:\n Action bar rendering in layoutlib [DO NOT MERGE]\n" }, { "commit": "052e0c589e5cf714ca71bc8d7b3ce8b3f6c4cb96", "tree": "3ce7eff241abdefe40d302f9de0a917f2e17db90", "parents": [ "9602fc1c00e5e5cdf26cdc3fe22022ffcd115361", "770e40f839f059e1e3a15a2b14157c7cbb3b0553" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:20:20 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:20:20 2014 +0000" }, "message": "am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n\n* commit \u0027770e40f839f059e1e3a15a2b14157c7cbb3b0553\u0027:\n Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n" }, { "commit": "9602fc1c00e5e5cdf26cdc3fe22022ffcd115361", "tree": "1c4d72574786e0457914360d47cf93257d66641b", "parents": [ "c9a4badb54320f8c52d2da06a762b5e6eef00ee0", "87665388466812897e888680c0b2a1d7db1b9cbd" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:20:16 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:20:16 2014 +0000" }, "message": "am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n\n* commit \u002787665388466812897e888680c0b2a1d7db1b9cbd\u0027:\n Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n" }, { "commit": "69b3115e1c02f2b22165b93bd9bcc5c90ec69b12", "tree": "3d673806a4fdbae13801a8ef1ccf44472fa5977a", "parents": [ "82d5bd98b77a9955e375b075e262639625c40232", "e183855c1eb7baf750c67bb20e70fb887eba7af6" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:19:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:19:52 2014 +0000" }, "message": "am e183855c: Add methods for Time_Delegate [DO NOT MERGE]\n\n* commit \u0027e183855c1eb7baf750c67bb20e70fb887eba7af6\u0027:\n Add methods for Time_Delegate [DO NOT MERGE]\n" }, { "commit": "2fb139e02c1e9d2d7c92acf813445a063e73d94f", "tree": "e781df18468b5468a781415fa1546c9b54ec6d33", "parents": [ "f20c9c660edcce0fe90ba5f8464f726dcd51229e", "9f2f5e776aed6bfcd87be0b7dd6aa9d22af28817" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon May 12 19:01:41 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon May 12 19:01:41 2014 -0700" }, "message": "resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev\n\nChange-Id: Id8cb5e2e9d0c41bdaf767563ebd6e3951ae68a3c\n" }, { "commit": "6f6989f3532b0022c8ebed59dbd9e4fdc5362978", "tree": "60455c773b12d2bd4c68ea9eb3a5bb7d54ec0e25", "parents": [ "6c600df67388706d24486022fa73ed8786119faf", "80f2914b4b12340ff590882125789144d4f00ce0" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:00:17 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:00:17 2014 +0000" }, "message": "am 80f2914b: am b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]\n\n* commit \u002780f2914b4b12340ff590882125789144d4f00ce0\u0027:\n Add view cookies for action bar menus. [DO NOT MERGE]\n" }, { "commit": "e7c3ed442753c0ada27450868adcf1ff98fe9c39", "tree": "ad6cc4966f01446420f8a43b340b0803973c66b7", "parents": [ "c88d4c572f95a6b2397cd2c2931b1a51c673a3c8", "21404483adbd4f26b5a2c7ebee7c09e83f42607e" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:00:11 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:00:11 2014 +0000" }, "message": "am 21404483: am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]\n\n* commit \u002721404483adbd4f26b5a2c7ebee7c09e83f42607e\u0027:\n Action bar rendering in layoutlib [DO NOT MERGE]\n" }, { "commit": "57c0cf454ab8d8d321f2a10c4914eb4414722392", "tree": "74965956271b9185ad7eb11d54c4925797309329", "parents": [ "3195ff0afad61fbb0787b80023bdb22ece4ecb6f", "71acfa6c1933806a080fc6efb820833f8de68d54" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:00:06 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:00:06 2014 +0000" }, "message": "am 71acfa6c: am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n\n* commit \u002771acfa6c1933806a080fc6efb820833f8de68d54\u0027:\n Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n" }, { "commit": "3195ff0afad61fbb0787b80023bdb22ece4ecb6f", "tree": "500a9d86305e6bd6f73878ef774ed238f61c1e31", "parents": [ "4654bfc14ce664e6a6247ffa0fdace17f3eeb964", "b90db3e6ab1bc89752ce8d7bd286268c41843693" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:00:03 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:00:03 2014 +0000" }, "message": "am b90db3e6: am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]\n\n* commit \u0027b90db3e6ab1bc89752ce8d7bd286268c41843693\u0027:\n Remove references to non-std Java classes. [DO NOT MERGE]\n" }, { "commit": "4654bfc14ce664e6a6247ffa0fdace17f3eeb964", "tree": "ce4f5f42a41dc5330e16e2f9c65a6a77c97181ce", "parents": [ "863b49ccaa77c7b0960220fca158099f3a79cb6a", "c2a6f3b1eda89365eec2508aec4a3a5024c140e5" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 01:59:58 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 01:59:58 2014 +0000" }, "message": "am c2a6f3b1: am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n\n* commit \u0027c2a6f3b1eda89365eec2508aec4a3a5024c140e5\u0027:\n Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n" }, { "commit": "8a70bcef5a724906e3c35c58cb2266ee9c9e1b78", "tree": "f2cb1b765259a60932381baaab6da5436d03b237", "parents": [ "40fea8b1bf689933e63941b5fa5e3379f82c88b5", "5a7b3b65b691edbdb855eb6154b8b30f5700acbb" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon May 12 18:57:34 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon May 12 18:57:34 2014 -0700" }, "message": "resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp\n\nChange-Id: I6bafdb9c6a8dfc6f55a4d9adf67f447661137eb8\n" }, { "commit": "9f2f5e776aed6bfcd87be0b7dd6aa9d22af28817", "tree": "c973773aae23028496acb208e58b7449f00ef162", "parents": [ "06c4f23d737082717f37f5f3583d9c12f4b64bf2", "2d82586b96593b1b3b5280d77d5ae9a09df9d1fd" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 01:52:25 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 01:52:25 2014 +0000" }, "message": "am 2d82586b: Fix CalendarView to show the right labels. [DO NOT MERGE]\n\n* commit \u00272d82586b96593b1b3b5280d77d5ae9a09df9d1fd\u0027:\n Fix CalendarView to show the right labels. [DO NOT MERGE]\n" }, { "commit": "0f209967bfc4a6f1eec46cc34a39cfe8af9f8af9", "tree": "d337c6e270c69cfec7b8d70b6a5e85862335cdd7", "parents": [ "26c373213592ce7fb5a09f23a3d9d3ca0727e346" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri Apr 18 12:32:38 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 07 18:09:46 2014 -0700" }, "message": "Add view cookies for action bar menus. [DO NOT MERGE]\n\nThe change adds the view cookies for the menus rendered in the action\nbar. This enables the IDE to map the menu to the relevant XML Tag in the\nmenu xml and show the highlighting accordingly.\n\nThe change also contains a bugfix where a method wasn\u0027t renamed\nproperly.\n\nChange-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca\n(cherry-picked from commit 094fd8ecb6f4b666be6c9e7332679bce28fdc3ca)\n" }, { "commit": "43b15371f9f1da7d97fe0500eb1536d981097e31", "tree": "174c5c9408065f54be42985ed605e53fe912805c", "parents": [ "770e40f839f059e1e3a15a2b14157c7cbb3b0553" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Dec 12 12:16:24 2013 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 06 14:02:48 2014 -0700" }, "message": "Action bar rendering in layoutlib [DO NOT MERGE]\n\nThis also makes a couple of changes to the framework:\n1. ShareActionProvider - Use edit mode to execute activity chooser code.\n2. ActionBarImpl - add a new constructor for use by layoutlib.\n\nThis also relies on some changes to the plugin to pass the correct params.\n\nChange-Id: Ia30fef816afd91ec1e439734d56b59b1323bfee2\n(cherry-picked from fe38489f6734fefd0a216e9cfe12f8f978ff371f)\n" }, { "commit": "770e40f839f059e1e3a15a2b14157c7cbb3b0553", "tree": "d8c6427251c18f66e8bf84088ab1dc2d3bcd57ab", "parents": [ "87665388466812897e888680c0b2a1d7db1b9cbd" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Mar 11 18:02:44 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 06 14:02:47 2014 -0700" }, "message": "Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n\nChange-Id: Icfb91e566666408802dadc0e2070991151b16b9d\n(cherry picked from commit 76dccb7f436565136ff5e15b1ca57530940f5642)\n" }, { "commit": "87665388466812897e888680c0b2a1d7db1b9cbd", "tree": "231ce6d94e99ffe954b3f978c4bfd004f6caaf42", "parents": [ "d915dcac365b6d3ad88afab52e74ccca7dfbefec" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Mar 31 18:59:45 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 06 14:02:47 2014 -0700" }, "message": "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n\nThe bug caused some classes to be missed when computing the dependencies\nof the existing classes.\n\nThis change includes the new mock_android.jar compiled from the mock\nsources again.\n\nChange-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa\n(cherry-picked from 6136af326e64037184a7a2a3ae60c399f04d631f)\n" }, { "commit": "e183855c1eb7baf750c67bb20e70fb887eba7af6", "tree": "605ee71b08c79e1afd44d296bd595ad26449f13f", "parents": [ "e5a2347bc6cf1506799136af4c9724275ca0247e" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri Jan 31 19:03:48 2014 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 06 14:02:45 2014 -0700" }, "message": "Add methods for Time_Delegate [DO NOT MERGE]\n\nBug: http://b.android.com/65359\nChange-Id: I7c2d09286d6bcd9899444aaa5a4a5a342e39d923\n(cherry-picked from 02cde9ceeb4c052ee273a5d809816dfd355ebb56)\n" }, { "commit": "5a7b3b65b691edbdb855eb6154b8b30f5700acbb", "tree": "d3dc6d36dc0fe3c1f20887caaab0c48ebbff758c", "parents": [ "4b5da86d04200ba278b62ff99da91e212b87e9af" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Sep 10 15:41:21 2013 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 06 13:55:56 2014 -0700" }, "message": "Remove references to non-std Java classes. [DO NOT MERGE]\n\nDo not add the non-standard Java classes. Updates the references to all\nnon-standard classes to new classes in\ncom.android.tools.layoulib.create package. This also treats\njava.lang.AutoCloseable which is part of Java 7 similarly so that we can\nstill run on Java 6.\n\nThis also adapts the cherrypick for this branch by updating references\nto the non-standard Java classes present in this branch. This also\nincludes the following change that includes some changes that the\noriginal cherrypick missed.\nChange-Id: I76c87c74ee088778b37d1a7a7d531e0fde5c758f\ncommit: 1ed75bde09275c9f2bd1f81830e381ea864ac7f5\n\nChange-Id: Iac5b272652e2780c9bb72d19f415d150948ca589\n(cherry picked from 80c668f2a076e91d887dbf77776cd503ff88b0b4)\n" }, { "commit": "2d82586b96593b1b3b5280d77d5ae9a09df9d1fd", "tree": "612a59c1b4d1d3b847a4b15a7379aeecf8d46986", "parents": [ "64dc0380127047ffcf135b6848c9150aa8dbed85" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Oct 14 18:14:58 2013 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon May 05 18:32:04 2014 -0700" }, "message": "Fix CalendarView to show the right labels. [DO NOT MERGE]\n\nChange-Id: I95431f1054678d4192bd1621c1f69b29268f55e9\n(cherry picked from commit 44bcd64e5b9fd211dd56b0598693a0559f65dc1a)\n" }, { "commit": "094fd8ecb6f4b666be6c9e7332679bce28fdc3ca", "tree": "7338cbdd74ca211525fb12553d6dde3f2d808de3", "parents": [ "56759be8960ea1b5dc8b6de1810a84e2f10e2058" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri Apr 18 12:32:38 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sun May 04 13:29:14 2014 -0700" }, "message": "Add view cookies for action bar menus. [DO NOT MERGE]\n\nThe change adds the view cookies for the menus rendered in the action\nbar. This enables the IDE to map the menu to the relevant XML Tag in the\nmenu xml and show the highlighting accordingly.\n\nThe change also contains a bugfix where a method wasn\u0027t renamed\nproperly.\n\nChange-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca\n(cherry-picked from commit 7704837947455909f295b088a3d15a20e107dbd7)\n" }, { "commit": "7704837947455909f295b088a3d15a20e107dbd7", "tree": "6aa55e664b68adcca59fa7130df5d52d6ad0bbf8", "parents": [ "75f435b0f411eae66b4e34ec24f03a5d09d2be26" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri Apr 18 12:32:38 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri May 02 17:33:05 2014 -0700" }, "message": "Add view cookies for action bar menus. [DO NOT MERGE]\n\nThe change adds the view cookies for the menus rendered in the action\nbar. This enables the IDE to map the menu to the relevant XML Tag in the\nmenu xml and show the highlighting accordingly.\n\nThe change also contains a bugfix where a method wasn\u0027t renamed\nproperly.\n\nChange-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca\n(cherry-picked from commit 5ba2f230faa355eb9bc1e90f6c48eeeb437f390c)\n" }, { "commit": "fe38489f6734fefd0a216e9cfe12f8f978ff371f", "tree": "48c9ce41ed33c61329a82c898fc3378dafe6a0a3", "parents": [ "cc5340bc6301f8d9bf2cdb6ad2036964a3d179f5" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Dec 12 12:16:24 2013 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri May 02 16:23:14 2014 -0700" }, "message": "Action bar rendering in layoutlib [DO NOT MERGE]\n\nThis also makes a couple of changes to the framework:\n1. ShareActionProvider - Use edit mode to execute activity chooser code.\n2. ActionBarImpl - add a new constructor for use by layoutlib.\n\nThis also relies on some changes to the plugin to pass the correct params.\n\nChange-Id: Ia30fef816afd91ec1e439734d56b59b1323bfee2\n(cherry-picked from 20e0695b554e883b095f5223be10b6e1097db49f)\n" }, { "commit": "76dccb7f436565136ff5e15b1ca57530940f5642", "tree": "fe4e247faa5631a3ae91971c46b8c59db2230b15", "parents": [ "1ed75bde09275c9f2bd1f81830e381ea864ac7f5" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Mar 11 18:02:44 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri May 02 16:23:13 2014 -0700" }, "message": "Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n\nChange-Id: Icfb91e566666408802dadc0e2070991151b16b9d\n(cherry picked from commit 3c00b28bf60ab01b449e16df045238f4bae4d700)\n" }, { "commit": "1ed75bde09275c9f2bd1f81830e381ea864ac7f5", "tree": "56caf765d12c9c62aed360ed3b00224e5b0a210b", "parents": [ "6136af326e64037184a7a2a3ae60c399f04d631f" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Sep 10 15:41:21 2013 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri May 02 16:22:14 2014 -0700" }, "message": "Remove references to non-std Java classes. [DO NOT MERGE]\n\nThis change adds a substitute for the Charsets class in java namespace.\nThe original cherry pick of the change had dropped this substitute. But\nthe substitute is required for bug b.android.com/59732\n\nThe original cherry-pick is 6335590aa8997944cc7fb358a315dbb9b789f87f and\nthe original change is 81f74f4bc96ea4266cebe1b785d095558f540800\nThe original Change-Id is Iac5b272652e2780c9bb72d19f415d150948ca589\n\nChange-Id: I76c87c74ee088778b37d1a7a7d531e0fde5c758f\n" }, { "commit": "6136af326e64037184a7a2a3ae60c399f04d631f", "tree": "81ae07be512cd2b09d0e5bc704697ce334ff6ccd", "parents": [ "2bd65db15fa6a265ccc4023161611088bc791b4e" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Mar 31 18:59:45 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri May 02 15:38:42 2014 -0700" }, "message": "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n\nThe bug caused some classes to be missed when computing the dependencies\nof the existing classes.\n\nChange-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa\n(cherry-picked from 6f9baea47757fef4745de434e09bd552fddc1f03)\n" } ], "next": "495c14d8b8e8a52554cfc0776c48d328657cda95" }