)]}' { "log": [ { "commit": "7e74da3172cb175dd1fe4e1ffb48d8f7914225ca", "tree": "7eed72fd8d79c84dabbcf50f0f08822a06303822", "parents": [ "7abdfaa742b64ab5a68e0cede51f4fe30fd21662", "e97908d32ee8ea80138d085260a0eac93841c722" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Fri Dec 05 19:16:27 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 05 19:16:27 2014 +0000" }, "message": "am e97908d3: Merge commit \\\u00270953ab27\\\u0027 into manualmerge\n\n* commit \u0027e97908d32ee8ea80138d085260a0eac93841c722\u0027:\n AAPT: Move private attrs to new type for framework\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": "9fb42f07784ac9e1ab29fa7d5bcda6c3081d238f", "tree": "23fe00a35b718051d190f018ed8603d0c06acb14", "parents": [ "e1a96f7fe217ccc610bd3cfb4e9a66630c816571", "a75b0ad3842a5cfc406fbd9c7a36bf8a7bdcf069" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Thu Dec 04 13:51:41 2014 -0800" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Thu Dec 04 13:51:41 2014 -0800" }, "message": "resolved conflicts for merge of a75b0ad3 to master\n\nChange-Id: I32a2d129c556407727ada909daa6470309d42499\n" }, { "commit": "a75b0ad3842a5cfc406fbd9c7a36bf8a7bdcf069", "tree": "aef030b2f3b65e829e3569a0b0304b609f1c856c", "parents": [ "1c88fc009fb3f7a3b5f085abb6a40cf4d845d662", "a51a0901ada5e2bc472c379a39df13ff48e666ed" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Thu Dec 04 13:41:04 2014 -0800" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Thu Dec 04 13:41:04 2014 -0800" }, "message": "resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp\n\nChange-Id: Id7df835f0bd3d5d276b162635ddfb7fe0918dfed\n" }, { "commit": "720beef28dacc924d77576f63fced84e6a820dc6", "tree": "11cdfd10ab302973dd88a6928a8637d461a080fd", "parents": [ "391232da084d715b9f20539a98b4a49cc56bf949", "9b624c186cb6059dfb3ec24bfb6386a0fc17b88c" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Dec 04 18:24:39 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 04 18:24:41 2014 +0000" }, "message": "Merge \"AAPT: Move private attrs to new type for framework\" into lmp-mr1-dev" }, { "commit": "63377406f7dd1a7adb8631cebf174b34951098e7", "tree": "6ad5df31bd32f622e3520cf2d05398259f9d0e58", "parents": [ "8e8a24d79300066df10f99004ab987d9089fde79", "8e5362f20e2bc41b1dcf130a613b7e0b3cd1db58" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Dec 04 16:17:12 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 04 16:17:12 2014 +0000" }, "message": "am 8e5362f2: am 503071ae: am a2b5067a: Merge \"RRO: prevent duplicate system overlays\"\n\n* commit \u00278e5362f20e2bc41b1dcf130a613b7e0b3cd1db58\u0027:\n RRO: prevent duplicate system overlays\n" }, { "commit": "8e5362f20e2bc41b1dcf130a613b7e0b3cd1db58", "tree": "e395d9177a329782dd5be2a5ec228b1abe3093a2", "parents": [ "c0707c007d8322338e9f46f5ccb04b5582e75845", "503071ae41374a66f61e53e05a91243473db83b9" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Dec 04 09:21:45 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 04 09:21:45 2014 +0000" }, "message": "am 503071ae: am a2b5067a: Merge \"RRO: prevent duplicate system overlays\"\n\n* commit \u0027503071ae41374a66f61e53e05a91243473db83b9\u0027:\n RRO: prevent duplicate system overlays\n" }, { "commit": "9b624c186cb6059dfb3ec24bfb6386a0fc17b88c", "tree": "e57516e076eddb75d4c657704522f43067153c2a", "parents": [ "92ad4dd017a13364b4001bdb04911202932f81c2" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Nov 19 17:49:26 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Dec 03 15:59:20 2014 -0800" }, "message": "AAPT: Move private attrs to new type for framework\n\nPrivate attributes are typically placed after public\nattributes in the resource table. Each time a new version\nof the Android framework is released, new public attributes\ntake the place of the private attributes, and the private\nattributes are shifted after the new public ones.\n\nThis means that any apps built against the newer SDK\nmay inadvertently be using private attributes on older\ndevices.\n\nThis change moves all private attributes to a completely\ndifferent type ID, so there will never be collisions across\nversions.\n\nThese private attributes are automatically moved to a synthesized\ntype only for the system resources.\n\nBug:18263655\n\nChange-Id: I7a850512953fadcc9f3524d509cea30249782db8\n" }, { "commit": "01a5ea35fbba4c5bb1d7790ae1677a2fa752e042", "tree": "d890ced3bdb3be6275e2d13d0dbd9f901ec8ce4d", "parents": [ "8d72046b9ba06feadbcf71815a1c6e1017c8da37" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Wed Dec 03 13:01:07 2014 -0800" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Wed Dec 03 13:03:59 2014 -0800" }, "message": "Resume RT-animations after a pauseSurface\n\nBug: 18203577\n\nThe issue occurs as a result of performTraversals() both doing\na window relayout call *and* early-returning because it\u0027s not dirty.\n\nTo fix this pauseSurface() returns whether or not the RT-side is\n\"dirty\" to force ViewRootImpl to do a draw even if mDirty is\notherwise empty.\n\nChange-Id: I534f367e75d18d273ebf14df3927f5c464ef6bef\n" }, { "commit": "a2b5067aeef5b2d68a7a2f7b4edc7ee0908b5d5b", "tree": "db4b1a0c53a697fb010a6feba69e9b2bb11250fd", "parents": [ "abdaa32dd79c915d0e419560c8eaa64e3d946b77", "cb7b63d928cd562ea66d10d816056b984f50193a" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Dec 03 17:44:17 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 03 17:44:18 2014 +0000" }, "message": "Merge \"RRO: prevent duplicate system overlays\"" }, { "commit": "625fa573b4cea5c5ee86f79ef76f16545935507e", "tree": "f046cd0b33cd4ccbf4588680f17cfd687427693a", "parents": [ "83cb9cad31ec57923497d218d6febf6f17be70dd", "9438ad1599716176fb6c593e77a2e93b265bbcb5" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Wed Dec 03 00:30:56 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 03 00:30:56 2014 +0000" }, "message": "am 9438ad15: am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c\n\n* commit \u00279438ad1599716176fb6c593e77a2e93b265bbcb5\u0027:\n RRO idmap: pad with 0xffffffff, not 0x00000000\n RRO: reintroduce lost ResTable insert of assets\n" }, { "commit": "9438ad1599716176fb6c593e77a2e93b265bbcb5", "tree": "b8d7eef8c9baf5837a896a0e2ccbdd7f1d930a29", "parents": [ "723bce8a0d4fa900ca4344c03e5e82b5881fcf19", "e580d6617f67a1db5eff7ffe5450684cfc7e1a2b" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Dec 02 23:07:43 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 02 23:07:43 2014 +0000" }, "message": "am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c\n\n* commit \u0027e580d6617f67a1db5eff7ffe5450684cfc7e1a2b\u0027:\n RRO idmap: pad with 0xffffffff, not 0x00000000\n RRO: reintroduce lost ResTable insert of assets\n" }, { "commit": "e89a286541e242ad96705fcdd1fe2c6a9eafb4a0", "tree": "c55e1a0c4cc7a2c22c4bb4dfa190a2fb38f6a3df", "parents": [ "acd01ff07668a608cb4890a2ea1533a2397149c8", "96198ebae8deab14b434645f628213db492abdbc" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Dec 02 22:52:36 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 02 22:52:37 2014 +0000" }, "message": "Merge changes If2c7e09f,Ie21f227c\n\n* changes:\n RRO idmap: pad with 0xffffffff, not 0x00000000\n RRO: reintroduce lost ResTable insert of assets\n" }, { "commit": "e749bd2c72d14519f6ac24d5efc399b0dafc507d", "tree": "eb116f344939239a74dd782effa6c43640d4101e", "parents": [ "004367a15990c8b9a40812b986c5df2cc0484459", "a22ab0da6f72b2e52166cc6e11f4c6d44c0fb714" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Tue Dec 02 01:45:54 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 02 01:45:54 2014 +0000" }, "message": "am a22ab0da: am 9a04480e: am ef124887: Merge \"Clip outline to View clip bounds for shadow computation\" into lmp-mr1-dev\n\n* commit \u0027a22ab0da6f72b2e52166cc6e11f4c6d44c0fb714\u0027:\n Clip outline to View clip bounds for shadow computation\n" }, { "commit": "a22ab0da6f72b2e52166cc6e11f4c6d44c0fb714", "tree": "9c93658e1586d303e066fb3bd67b187a5b38cedf", "parents": [ "3380f4961814c0aaa23e92dca4d2999ebb254f65", "9a04480e36c42eb63d1d727221ba3ce6a6d533ef" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Tue Dec 02 01:39:20 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 02 01:39:20 2014 +0000" }, "message": "am 9a04480e: am ef124887: Merge \"Clip outline to View clip bounds for shadow computation\" into lmp-mr1-dev\n\n* commit \u00279a04480e36c42eb63d1d727221ba3ce6a6d533ef\u0027:\n Clip outline to View clip bounds for shadow computation\n" }, { "commit": "ef124887c616d03cf0a689d2b7d5b1894405d12e", "tree": "eda6c9f10b7d7391b3e4e73075de480067373675", "parents": [ "93b429247673bb8e019fe9d39b46700fc86c3313", "faa79ff9d964de940660d2226d5b06ded9294597" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Tue Dec 02 01:27:24 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 02 01:27:26 2014 +0000" }, "message": "Merge \"Clip outline to View clip bounds for shadow computation\" into lmp-mr1-dev" }, { "commit": "faa79ff9d964de940660d2226d5b06ded9294597", "tree": "f0cffdaa4de22117f6a47268a17d52f79e1e0bad", "parents": [ "293f0f380b514658f63474b714053fda0e92569f" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Mon Dec 01 13:44:21 2014 -0800" }, "committer": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Mon Dec 01 15:47:10 2014 -0800" }, "message": "Clip outline to View clip bounds for shadow computation\n\nbug:18509823\n\nThis allows animations of View clipBounds (and other callers of\nsetClipBounds) to affect shadows, instead of leaving them floating.\n\nChange-Id: I249fa4b371a170cb0c54001f5b0e0097e109b8b8\n" }, { "commit": "76de89820c51c4bc288b440a82374b9d6c806244", "tree": "bac5be532ce1ef3c84c973752529a5cccfbb374a", "parents": [ "e6bd61d5bbea012b6b80c8bff915042f615630bc", "a12b2405df5c12363e24cebc684f5f3a5c9a5b7b" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Mon Dec 01 22:39:29 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Dec 01 22:39:31 2014 +0000" }, "message": "Merge \"Prevent calling GL functions with an invalid surface\" into lmp-mr1-dev" }, { "commit": "c5cf471758169f7ffdf7669568a7780902159790", "tree": "f8ff84ce373fde3e5163c466bf5f6f28a2ce2037", "parents": [ "6e8fea14ccc4c30d56a7f70c9addf3d5b8a229d2", "d7af6eaace4ffdd3635a1cdeff65e9dc1af39f67" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Mon Dec 01 21:47:03 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Dec 01 21:47:03 2014 +0000" }, "message": "am d7af6eaa: am d51205fd: am 6afc5cf3: Merge \"Prevent calling GL functions with an invalid surface\"\n\n* commit \u0027d7af6eaace4ffdd3635a1cdeff65e9dc1af39f67\u0027:\n Prevent calling GL functions with an invalid surface\n" }, { "commit": "d7af6eaace4ffdd3635a1cdeff65e9dc1af39f67", "tree": "db08af2392b33783928c8ff5954301131d5e09aa", "parents": [ "b62b1b03792e7c583ec1a51a3d621deb51663414", "d51205fda7351ca32e54ef34b32e72f6c7c79847" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Mon Dec 01 21:40:32 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Dec 01 21:40:32 2014 +0000" }, "message": "am d51205fd: am 6afc5cf3: Merge \"Prevent calling GL functions with an invalid surface\"\n\n* commit \u0027d51205fda7351ca32e54ef34b32e72f6c7c79847\u0027:\n Prevent calling GL functions with an invalid surface\n" }, { "commit": "a12b2405df5c12363e24cebc684f5f3a5c9a5b7b", "tree": "395524d5f2413969c38197aa7db765e45e29c655", "parents": [ "6cacf44e7ecfe50097adc99dab97c3fb9770a1af" ], "author": { "name": "Sangkyu Lee", "email": "sk82.lee@lge.com", "time": "Fri Nov 21 18:05:41 2014 +0900" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Mon Dec 01 21:38:34 2014 +0000" }, "message": "Prevent calling GL functions with an invalid surface\n\nBug: 18518580\n\nWhen destroying CanvasContext, the surface can be invalid\nstate. So the surface should be updated to null prior to\ndestroying GL resources to ensure that GL functions\nare not called with an invalid surface.\nSome GL implementation makes an error if GL functions\nare called with an invalid surface. (Adreno 3xx)\n\nCherry picked from AOSP: f76d36f96bf221672e98e440c9df7cbf0e02e84e\n\nChange-Id: Ie6f6ea081ec931fc9df30b2c3ed066ec1ae9d294\n" }, { "commit": "6afc5cf3d9e1a0c0eb6ecd6eea258f1ccd37bef3", "tree": "5e99b6642ba777f398bdb06f3fb0cbc652bb3823", "parents": [ "ee7c30e1f9a40b6498f7aa374e71bb0bfc6482a3", "f76d36f96bf221672e98e440c9df7cbf0e02e84e" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Mon Dec 01 21:28:26 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Dec 01 21:28:27 2014 +0000" }, "message": "Merge \"Prevent calling GL functions with an invalid surface\"" }, { "commit": "659de832b9796e14de44b6411980a65e33283a93", "tree": "9ab610781d982dbef689dacf38a7bfc47da18a81", "parents": [ "f90404ca7b47234437b3f8f418fca313825de02c", "52b2cf9fdf95ccdcbb3f5e403eb9691c1ead1214" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Mon Dec 01 20:08:27 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Dec 01 20:08:29 2014 +0000" }, "message": "Merge \"Enable stencil clipping within clearLayerRegions\" into lmp-mr1-dev" }, { "commit": "62bdf2c86342db66d86ceff3a8c0b609e4570bfc", "tree": "7a1de1fc46fad8849e465038311cf02bb4e6e1e9", "parents": [ "ddf7e2dfc26ea5341c62cb5391a1cfb12cd8c129", "e986817a2dc8a412c12e456319965a67ac60f236" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Wed Nov 26 21:08:00 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 26 21:08:00 2014 +0000" }, "message": "am e986817a: am 6eac26a4: am ca84c8b1: Merge \"Revert \"Force-use the pbuffer surface for destroy\"\" into lmp-mr1-dev\n\n* commit \u0027e986817a2dc8a412c12e456319965a67ac60f236\u0027:\n Revert \"Force-use the pbuffer surface for destroy\"\n" }, { "commit": "e986817a2dc8a412c12e456319965a67ac60f236", "tree": "b2d50e32c557e8f7c38c0c8f09c9886bc82e0114", "parents": [ "0eaee607b8799bc6635efc8e65df13b6411b5a84", "6eac26a49957eda233ad22ad75da43379f220bbc" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Wed Nov 26 21:02:24 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 26 21:02:24 2014 +0000" }, "message": "am 6eac26a4: am ca84c8b1: Merge \"Revert \"Force-use the pbuffer surface for destroy\"\" into lmp-mr1-dev\n\n* commit \u00276eac26a49957eda233ad22ad75da43379f220bbc\u0027:\n Revert \"Force-use the pbuffer surface for destroy\"\n" }, { "commit": "ca84c8b1b0e364e01ce392f0dbca5132830a148d", "tree": "380eb2c186cf19a4b4c76f8de342c9b9c8182f90", "parents": [ "a181da10ac5a7fc750d046e7789ba2244ee563b9", "9f81485a76dd02a07fd460a29db6adddd2ca2efe" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Wed Nov 26 20:50:08 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 26 20:50:10 2014 +0000" }, "message": "Merge \"Revert \"Force-use the pbuffer surface for destroy\"\" into lmp-mr1-dev" }, { "commit": "9f81485a76dd02a07fd460a29db6adddd2ca2efe", "tree": "b83710c292efceb1675ae0a1adb543ba24b704a7", "parents": [ "b945f2313aee6e49a082ba5caaf95334d2570d52" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Wed Nov 26 18:59:58 2014 +0000" }, "committer": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Wed Nov 26 18:59:58 2014 +0000" }, "message": "Revert \"Force-use the pbuffer surface for destroy\"\n\nbug:18528859\n\nThis reverts commit b945f2313aee6e49a082ba5caaf95334d2570d52.\n\nChange-Id: I6915624d356cb8570471eb3a5b8921f59b58db6d\n" }, { "commit": "52b2cf9fdf95ccdcbb3f5e403eb9691c1ead1214", "tree": "48c2a12a644d15b458030915541a6adfac0539ff", "parents": [ "6c912b7d056c67b41fd46f31de168795e97c2336" ], "author": { "name": "Dohyun Lee", "email": "dohyun.lee@lge.com", "time": "Mon Nov 24 21:08:15 2014 +0900" }, "committer": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Wed Nov 26 10:51:32 2014 -0800" }, "message": "Enable stencil clipping within clearLayerRegions\n\nbug:18538502\n\nCherry-pick of adc0d9da8648abfea1035fb1108eceea9fd9b5b1 from AOSP\n\nPreviously stencil clipping within clearLayerRegions is disabled by commit\n62d307c2402777d5e53b4590af5f32f8c55afd81. However, clearing whole layer\nregions causes black-colored triangle regions when a TextView has\nRotateAnimation because the draw within clearLayerRegions does not\naffected by the current stencil clip.\n\nChange-Id: Id32a0b16754b109905f833e063ebfa156bd953f2\nSigned-off-by: Dohyun Lee \u003cdohyun.lee@lge.com\u003e\n" }, { "commit": "e39f788950c60f6468a038f88e6dc7ac5ee65f8f", "tree": "89d0720d85d43aaf47ad2daf77817d9980af1cdf", "parents": [ "2edf7d6065d7ac3bff500b93daab4860a3f3741d", "0d4ab958c11801f5453e999f930416c87c63d100" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Wed Nov 26 12:09:42 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 26 12:09:42 2014 +0000" }, "message": "am 0d4ab958: am 4e3404d9: am dec3f138: Merge \"Force-use the pbuffer surface for destroy\" into lmp-mr1-dev\n\n* commit \u00270d4ab958c11801f5453e999f930416c87c63d100\u0027:\n Force-use the pbuffer surface for destroy\n" }, { "commit": "3c96a2b8fe4b52a8617e84c8aced43326d964f55", "tree": "f3610b41eb7fc0f7edf8afb2f74a14cc71dba7c0", "parents": [ "6a2acff8c195b5b03ac022e7deb157cca06dadb6", "1fb141f83bad3884e2199c7acdc23932afaefe0c" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Wed Nov 26 12:09:28 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 26 12:09:28 2014 +0000" }, "message": "am 1fb141f8: am 9c5b7b09: am ee660651: Merge \"Improve DisplayList state output\" into lmp-mr1-dev\n\n* commit \u00271fb141f83bad3884e2199c7acdc23932afaefe0c\u0027:\n Improve DisplayList state output\n" }, { "commit": "0d4ab958c11801f5453e999f930416c87c63d100", "tree": "02b23e48142325e228d32e81783cdb7a84c7ca99", "parents": [ "2f47df83343e51214c792dc89874f0bccbeb4593", "4e3404d90fe33a0ff790aff4a97b6bb55e4c0e8f" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Wed Nov 26 12:02:19 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 26 12:02:19 2014 +0000" }, "message": "am 4e3404d9: am dec3f138: Merge \"Force-use the pbuffer surface for destroy\" into lmp-mr1-dev\n\n* commit \u00274e3404d90fe33a0ff790aff4a97b6bb55e4c0e8f\u0027:\n Force-use the pbuffer surface for destroy\n" }, { "commit": "1fb141f83bad3884e2199c7acdc23932afaefe0c", "tree": "2eb9679e2494a207378ae5dd127f4c68632b58c5", "parents": [ "6df037ac5d2b4b6f027ca36284ee09ed10970cd8", "9c5b7b094254cad0a8a90ece5ea650c49694087d" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Wed Nov 26 12:01:46 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 26 12:01:46 2014 +0000" }, "message": "am 9c5b7b09: am ee660651: Merge \"Improve DisplayList state output\" into lmp-mr1-dev\n\n* commit \u00279c5b7b094254cad0a8a90ece5ea650c49694087d\u0027:\n Improve DisplayList state output\n" }, { "commit": "f76d36f96bf221672e98e440c9df7cbf0e02e84e", "tree": "e1c81a2faf4ea012f087292f198b703fc9d0288c", "parents": [ "f926d71b8ef2790da067550144860705c1a61fe5" ], "author": { "name": "Sangkyu Lee", "email": "sk82.lee@lge.com", "time": "Fri Nov 21 18:05:41 2014 +0900" }, "committer": { "name": "Sangkyu Lee", "email": "sk82.lee@lge.com", "time": "Wed Nov 26 09:59:39 2014 +0900" }, "message": "Prevent calling GL functions with an invalid surface\n\nWhen destroying CanvasContext, the surface can be invalid\nstate. So the surface should be updated to null prior to\ndestroying GL resources to ensure that GL functions\nare not called with an invalid surface.\nSome GL implementation makes an error if GL functions\nare called with an invalid surface. (Adreno 3xx)\n\nChange-Id: Ie6f6ea081ec931fc9df30b2c3ed066ec1ae9d294\n" }, { "commit": "47414be76179dbfefeb909012ef3e02e702bdf84", "tree": "212801c33cc0f5257cf5354888125965876e253d", "parents": [ "1f7b3b5c7d19c210d5bbc09d5734141aa6935eda", "ab1a53c509edbc8bacd944233335587dffd95999" ], "author": { "name": "Chris Craik", "email": "ccraik@android.com", "time": "Wed Nov 26 00:14:29 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 26 00:14:29 2014 +0000" }, "message": "am ab1a53c5: am bf62d307: am af5bd75b: Merge \"Enable stencil clipping within clearLayerRegions\"\n\n* commit \u0027ab1a53c509edbc8bacd944233335587dffd95999\u0027:\n Enable stencil clipping within clearLayerRegions\n" }, { "commit": "ab1a53c509edbc8bacd944233335587dffd95999", "tree": "97ee8869648bde18856e9449dc5b1fa9dfcec77e", "parents": [ "1fae0991326fbaac8a11ae972f0da2bbc50be429", "bf62d3070c1653b79f4edcc0729b6a1a833d3ca1" ], "author": { "name": "Chris Craik", "email": "ccraik@android.com", "time": "Wed Nov 26 00:08:05 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 26 00:08:05 2014 +0000" }, "message": "am bf62d307: am af5bd75b: Merge \"Enable stencil clipping within clearLayerRegions\"\n\n* commit \u0027bf62d3070c1653b79f4edcc0729b6a1a833d3ca1\u0027:\n Enable stencil clipping within clearLayerRegions\n" }, { "commit": "dec3f138c2f6a31879b0fe055a26d618e4874bb5", "tree": "56f1c4b6985c0c2e874242c4b564dc06548febf9", "parents": [ "c1de25d8ebaecff697c1d5dfaa445e18ee07fa2d", "b945f2313aee6e49a082ba5caaf95334d2570d52" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Tue Nov 25 19:52:52 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 25 19:52:53 2014 +0000" }, "message": "Merge \"Force-use the pbuffer surface for destroy\" into lmp-mr1-dev" }, { "commit": "fb7ff703e0f5fbf16c7805a162a3c5f44de5914b", "tree": "ca56e4c0d00eb8a465bb09547a29faad77002691", "parents": [ "82f5fde34c8a98ace75fbc0dab8ffb97485808e9", "5ab86ba05decf12e8ee3f693aab6b265905049c6" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Tue Nov 25 18:51:29 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 25 18:51:29 2014 +0000" }, "message": "am 5ab86ba0: am 89a63f02: am 0c31d97a: Merge \"Switch TextureCache to SkPixelRef::fStableId\" into lmp-mr1-dev\n\n* commit \u00275ab86ba05decf12e8ee3f693aab6b265905049c6\u0027:\n Switch TextureCache to SkPixelRef::fStableId\n" }, { "commit": "5ab86ba05decf12e8ee3f693aab6b265905049c6", "tree": "15e0238afc57509c9ca6da9bfce1c9babb2e7cb9", "parents": [ "18c295bf8b258e94050b2e2fb741cb597011159b", "89a63f02f5d0814435e72b515b792bc6737014dc" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Tue Nov 25 18:45:48 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 25 18:45:48 2014 +0000" }, "message": "am 89a63f02: am 0c31d97a: Merge \"Switch TextureCache to SkPixelRef::fStableId\" into lmp-mr1-dev\n\n* commit \u002789a63f02f5d0814435e72b515b792bc6737014dc\u0027:\n Switch TextureCache to SkPixelRef::fStableId\n" }, { "commit": "ee6606519d22805c1caf23a3c75cde9fc97b34eb", "tree": "923b1bdc3095cacfb77cc3d0b3ea0e29c24acc90", "parents": [ "d0f6b4f6297373e569e383edc21aaa3f87591e0b", "b5a5435a77bae40b55053ccde93b1ed45d0e8329" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Tue Nov 25 18:45:10 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 25 18:45:11 2014 +0000" }, "message": "Merge \"Improve DisplayList state output\" into lmp-mr1-dev" }, { "commit": "031cfc8f3f390eef032494c3b4c05e5295277fc9", "tree": "27d55fafc5a40b86bf764ee7b4bc693773044821", "parents": [ "642b4786357eedcf8a9b4043aa4852e6ef1ebdfc", "32d2e769ea6052aca2232c571a82ed7a7f8c996a" ], "author": { "name": "Dan Stoza", "email": "stoza@google.com", "time": "Tue Nov 25 18:33:32 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 25 18:33:34 2014 +0000" }, "message": "Merge \"Cast buffer width and height to int\"" }, { "commit": "b945f2313aee6e49a082ba5caaf95334d2570d52", "tree": "99319f925561305925e2dc3ec71c651f2f04b0cd", "parents": [ "0c31d97a38909e85e0df6cdc29469dbb1580ed4b" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Tue Nov 25 09:54:13 2014 -0800" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Tue Nov 25 09:54:13 2014 -0800" }, "message": "Force-use the pbuffer surface for destroy\n\nBug: 18518580\n\nIf CanvasContext is being destroyed() the Surface\nis probably no longer valid as well, so make sure to\nmakeCurrent() to the pbuffer surface so that the\nsubsequent GL operations are not using an invalid\nEGLSurface\n\nChange-Id: Ica5d6a065841772c47e00ad65aa7894c7e27e043\n" }, { "commit": "71d08a07189c2b433080203895d9d5e936b16b9e", "tree": "88079370391f3e5b8e7610911b247a5db50abf97", "parents": [ "9be80ee53ff5a3df51537f10b3d63f1f7f0ccd3e" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Mon Nov 24 15:21:28 2014 -0800" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Mon Nov 24 15:24:02 2014 -0800" }, "message": "Switch TextureCache to SkPixelRef::fStableId\n\nBug: 18245805\nChange-Id: I08e6792dbeed86b13e569c7f2137de0e50dc2763\n" }, { "commit": "adc0d9da8648abfea1035fb1108eceea9fd9b5b1", "tree": "8656d15624a473abdf019d1d8d51de2d74adeaac", "parents": [ "ff4dd15cd024f72cbd2b6d547356de030b2dd71c" ], "author": { "name": "Dohyun Lee", "email": "dohyun.lee@lge.com", "time": "Mon Nov 24 21:08:15 2014 +0900" }, "committer": { "name": "Dohyun Lee", "email": "dohyun.lee@lge.com", "time": "Mon Nov 24 21:08:15 2014 +0900" }, "message": "Enable stencil clipping within clearLayerRegions\n\nPreviously stencil clipping within clearLayerRegions is disabled by commit\n62d307c2402777d5e53b4590af5f32f8c55afd81. However, clearing whole layer\nregions causes black-colored triangle regions when a TextView has\nRotateAnimation because the draw within clearLayerRegions does not\naffected by the current stencil clip.\n\nChange-Id: Id32a0b16754b109905f833e063ebfa156bd953f2\nSigned-off-by: Dohyun Lee \u003cdohyun.lee@lge.com\u003e\n" }, { "commit": "476edb57012260990e19fe363e6433488518916a", "tree": "77c7eda352a230ceacf40e86c221119cbef8e67c", "parents": [ "fe8be26d6afc9f79e62525fb6cf6004221cccbfa", "ee46d1621f817d626e8dd42e9ffe7051f4a829eb" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Sat Nov 22 08:04:38 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Nov 22 08:04:38 2014 +0000" }, "message": "am ee46d162: am 08e2fd72: am ff4dd15c: Merge \"We HAVE_LITTLE_ENDIAN.\"\n\n* commit \u0027ee46d1621f817d626e8dd42e9ffe7051f4a829eb\u0027:\n We HAVE_LITTLE_ENDIAN.\n" }, { "commit": "ee46d1621f817d626e8dd42e9ffe7051f4a829eb", "tree": "5f32ddc31c7f34e797ceb3430ee0eafb7879fb14", "parents": [ "1da25f9331892be262289e3ce00dde23e685db03", "08e2fd7238c50b5d06af41bc944ee08acb023d51" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Sat Nov 22 07:56:46 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Nov 22 07:56:46 2014 +0000" }, "message": "am 08e2fd72: am ff4dd15c: Merge \"We HAVE_LITTLE_ENDIAN.\"\n\n* commit \u002708e2fd7238c50b5d06af41bc944ee08acb023d51\u0027:\n We HAVE_LITTLE_ENDIAN.\n" }, { "commit": "9d074a1fb727b7b4990cd0501e4661596e828c40", "tree": "e0bc3432c5e9eb4e95356b1c90fff11a6a54813f", "parents": [ "f1058308c62f297c5bca9e9baf8451efeb200805" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Nov 21 23:36:45 2014 -0800" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Nov 21 23:36:45 2014 -0800" }, "message": "We HAVE_LITTLE_ENDIAN.\n\nChange-Id: I5b5d0ef3f91fe84d629d2ddac436bd22019edfd4\n" }, { "commit": "64bb413a664001c95c8439cf097dc3033f4ed733", "tree": "d4562f7bb5656865d32e5d684b5a41542ecfaf58", "parents": [ "8a902d9f24e83c87b054adb5836b4a5b8a257be9" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Sat Nov 22 00:35:09 2014 +0000" }, "committer": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Sat Nov 22 00:35:09 2014 +0000" }, "message": "Revert \"resolved conflicts for merge of 220c3f4f to master\"\n\nReverted as hwui doesn\u0027t agree.\n\nThis reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9.\n\nChange-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a\n" }, { "commit": "b5a5435a77bae40b55053ccde93b1ed45d0e8329", "tree": "6589f39a057fd5af9147e05abcb2ecb37cc79c4a", "parents": [ "6c912b7d056c67b41fd46f31de168795e97c2336" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Fri Nov 21 14:54:35 2014 -0800" }, "committer": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Fri Nov 21 16:23:00 2014 -0800" }, "message": "Improve DisplayList state output\n\nbug:17991451\n\nLog hardware layers and shadow casting\n\nChange-Id: I2ae40f270d18f5b2a5af985513e0f5e8841216c2\n" }, { "commit": "8b59a528b54279ce640b2d23a00acae1d0f477c5", "tree": "fd10f5ffc634e0d574f269f7fd2f18b742f6e1d1", "parents": [ "42ddc18d108f789705ad4eb697ce9599ad322507" ], "author": { "name": "John Reck", "email": "jreck@android.com", "time": "Sat Nov 22 00:10:02 2014 +0000" }, "committer": { "name": "John Reck", "email": "jreck@android.com", "time": "Sat Nov 22 00:10:02 2014 +0000" }, "message": "Revert \"Frameworks/base: Unused parameters in hwui\"\n\nThis reverts commit 42ddc18d108f789705ad4eb697ce9599ad322507.\n\nChange-Id: I3574a936a39a96314db6437d0a1eb58d260d893d\n" }, { "commit": "8a902d9f24e83c87b054adb5836b4a5b8a257be9", "tree": "7a1842dd8f8b9b8e1880df7a3fe0fc7f5d103d48", "parents": [ "fa6547f6c0aad15c308a4ba946955087081ae1eb", "220c3f4f48b53b6010093a1ef437f4197a382ebf" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Fri Nov 21 15:51:04 2014 -0800" }, "committer": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Fri Nov 21 15:51:04 2014 -0800" }, "message": "resolved conflicts for merge of 220c3f4f to master\n\nChange-Id: I37ecce8fddecdff82b0eace16f1ee75152f7171e\n" }, { "commit": "32d2e769ea6052aca2232c571a82ed7a7f8c996a", "tree": "922ec403b48e7b6ff9ae8a7fc5622c987105946e", "parents": [ "5e88177ecbfb0b9e3ca84d1168aed192e31d2c68" ], "author": { "name": "Dan Stoza", "email": "stoza@google.com", "time": "Tue Nov 18 14:47:11 2014 -0800" }, "committer": { "name": "Dan Stoza", "email": "stoza@google.com", "time": "Fri Nov 21 14:48:04 2014 -0800" }, "message": "Cast buffer width and height to int\n\nGraphicBuffer::get{Width,Height} are going to start returning uint32_t\nvalues soon, so add the cast now to avoid breaking the build later.\n\nChange-Id: Ied33700fdf81e8aecbad95d66583818d15987b93\n" }, { "commit": "90102e10093f7bb658fb7dd6c30a1efd5380c6d1", "tree": "8e13cdc9be351def8f0b2c14b9ed60eb2f4592be", "parents": [ "220c3f4f48b53b6010093a1ef437f4197a382ebf", "1ae8a98e8a6ba82396955c0b6ab0e02568a3494b" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Fri Nov 21 22:21:02 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 21 22:21:02 2014 +0000" }, "message": "am 1ae8a98e: am 29dc496a: Merge \"Revert \"Add a way to override Xfermode DO NOT MERGE\"\" into lmp-mr1-dev\n\n* commit \u00271ae8a98e8a6ba82396955c0b6ab0e02568a3494b\u0027:\n Revert \"Add a way to override Xfermode DO NOT MERGE\"\n" }, { "commit": "2ab8298dc37851aab4623ba3f98d71055d653a73", "tree": "e31d76f1c16ec8e980983392b09287515bcec2f1", "parents": [ "4c9041cf837cda13c749b148661d18c3fab0fbd6", "99377df12ee696e01cd9071132f122801a9862ce" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Fri Nov 21 14:19:06 2014 -0800" }, "committer": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Fri Nov 21 14:19:06 2014 -0800" }, "message": "resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp\n\nChange-Id: I3a98f55832ac447b1ed0dd129c7a93d088025943\n" }, { "commit": "6bcf223bf64cd4895e3fe948080475075ff7b80d", "tree": "c2a3992a2ecf2f9f72b57b41e1c4230782310295", "parents": [ "158b6c98508f111de041853cab1d7a87b771b651", "da3198a550bdd91ccdc8a09c3a6e00d3b61c0c20" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Fri Nov 21 22:11:12 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 21 22:11:14 2014 +0000" }, "message": "Merge \"Revert \"Add a way to override Xfermode\"\"" }, { "commit": "29dc496a42d49a37dcd99c0465f3cec18a47e6ff", "tree": "b358eca2f3baeef7dbfb446b498fb0e9364bd4c1", "parents": [ "c0491a2e2d30eb4bc3e03fccee89d57e9bd575e4", "69e65019b0a6204f0ed9487d8fd7b3564eba6df8" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Fri Nov 21 22:11:11 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 21 22:11:13 2014 +0000" }, "message": "Merge \"Revert \"Add a way to override Xfermode DO NOT MERGE\"\" into lmp-mr1-dev" }, { "commit": "da3198a550bdd91ccdc8a09c3a6e00d3b61c0c20", "tree": "7586f8aaf58fd21b374f40f5da05308907b9aa42", "parents": [ "c495e611b9fa1fc6b47a647c714bbbf94dd63461" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Fri Nov 21 22:05:46 2014 +0000" }, "committer": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Fri Nov 21 22:05:46 2014 +0000" }, "message": "Revert \"Add a way to override Xfermode\"\n\nFeature no longer needed.\n\nbug:18448377\n\nThis reverts commit c495e611b9fa1fc6b47a647c714bbbf94dd63461.\n\nChange-Id: Ia3e37f06953ffd81ca3fac367ee790d26b1b5d29\n" }, { "commit": "69e65019b0a6204f0ed9487d8fd7b3564eba6df8", "tree": "9266aa679771904e019f1a0f08b250bf53d22ef5", "parents": [ "4678dcc5524258908eadc5fe1e5e1874768967eb" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Fri Nov 21 22:05:33 2014 +0000" }, "committer": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Fri Nov 21 22:05:33 2014 +0000" }, "message": "Revert \"Add a way to override Xfermode DO NOT MERGE\"\n\nFeature no longer needed.\n\nbug:18448377\n\nThis reverts commit 4678dcc5524258908eadc5fe1e5e1874768967eb.\n\nChange-Id: Ib0a19946e966a54857165555827b5fa7b34b6bea\n" }, { "commit": "42ddc18d108f789705ad4eb697ce9599ad322507", "tree": "53ed2c03a53112f6bfd515a6d03b02dfed0cc9e9", "parents": [ "f926d71b8ef2790da067550144860705c1a61fe5" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Fri Nov 21 09:49:08 2014 -0800" }, "committer": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Fri Nov 21 10:39:21 2014 -0800" }, "message": "Frameworks/base: Unused parameters in hwui\n\nRemove Clang cutout for unused parameters. Fix warnings.\n\nRemove Clang cutout for deprecated Skia function usage. Has been\nfixed in the L push.\n\nChange-Id: I7ea073ff67127cc1e14e798b655e2c50615fe8e7\n" }, { "commit": "06e7fe5a70409d2050b2b3e1286500f5223099da", "tree": "b7eea29ebe9ffc345f68a879199e2904c5c78423", "parents": [ "b946358bb5afd9db6a0914171d3f237c77abbfea", "f2235b6a48db2e16b52711570bf2a0d0cb0b0d90" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Thu Nov 20 17:27:36 2014 -0800" }, "committer": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Thu Nov 20 17:27:36 2014 -0800" }, "message": "resolve merge conflicts of f2235b6 to master.\n\nChange-Id: Ibcef3a37ca0749931d509b53bd52e53a7d30ddbb\n" }, { "commit": "f2235b6a48db2e16b52711570bf2a0d0cb0b0d90", "tree": "159f121d1330bba957764704de13720e785f3e3b", "parents": [ "cd24a6d70b54c79605e51fcc6a249313e9c25a51", "57b641a2ed87f2827399c363053436cba88bee75" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Thu Nov 20 16:38:06 2014 -0800" }, "committer": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Thu Nov 20 16:38:06 2014 -0800" }, "message": "resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp.\n\nChange-Id: I1be708f5a0cd4d64021a57f1063d54330f1d2d7e\n" }, { "commit": "47249598cbada478d7e0b8dca200599c50ea6e69", "tree": "f08e3368758a55e7be6401e54f7a3943b15e893b", "parents": [ "87f08193273c7e5c6615ea3afd2c947caae22ef0", "582bdf9a5961a32de27556832e23e0611c4d1cbb" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Nov 20 23:19:06 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 20 23:19:06 2014 +0000" }, "message": "am 582bdf9a: am d8c169fe: am 0c437fd3: Merge \"Add appropriate casts for char16_t.\"\n\n* commit \u0027582bdf9a5961a32de27556832e23e0611c4d1cbb\u0027:\n Add appropriate casts for char16_t.\n" }, { "commit": "582bdf9a5961a32de27556832e23e0611c4d1cbb", "tree": "ec33c632f8b6f6d0437342c4dfe211ae6e6f1ed3", "parents": [ "c51fdd1bbf507862c10686458d2486f57a5b9585", "d8c169fedf883491e46b354484909694fd52cfaf" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Nov 20 23:00:56 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 20 23:00:56 2014 +0000" }, "message": "am d8c169fe: am 0c437fd3: Merge \"Add appropriate casts for char16_t.\"\n\n* commit \u0027d8c169fedf883491e46b354484909694fd52cfaf\u0027:\n Add appropriate casts for char16_t.\n" }, { "commit": "6698749dd4d4d6513b26aa9071af290b956b68a7", "tree": "6c0716e521b60ff501f4aa4a3f7aff160578135f", "parents": [ "36c7f4b67326bad547f16aa6e72140bd839ab28d" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Nov 20 11:41:21 2014 -0800" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Nov 20 11:47:40 2014 -0800" }, "message": "Add appropriate casts for char16_t.\n\nC++11 defines a real char16_t, which is not implicitly convertible to\nuint16_t (and by extension jchar). Add casts as needed.\n\nBug: 18300613\nChange-Id: I00752002ef2e938bdb57f70947e8fd53ec103293\n" }, { "commit": "3b2ba44be3699a4e133d7a09cb4ed182405d7ff9", "tree": "fcded4723a443028815b3ee7e51fcd30a2fb53e7", "parents": [ "bf1960ce9c353267490d65cc1b8beacc7dd85347", "70850ea258cbf91477efa57a1f1a23cc0044cc93" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Thu Nov 20 17:36:24 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 20 17:36:26 2014 +0000" }, "message": "Merge \"Improve logging around performance critical events\" into lmp-mr1-dev" }, { "commit": "70850ea258cbf91477efa57a1f1a23cc0044cc93", "tree": "674621c2adc816afae2a1d09291fcd4af12b08e7", "parents": [ "6c912b7d056c67b41fd46f31de168795e97c2336" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Tue Nov 18 10:49:23 2014 -0800" }, "committer": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Wed Nov 19 17:24:30 2014 -0800" }, "message": "Improve logging around performance critical events\n\nbug:17702227\n\nAdd details useful to developers (such as layer size/View name), and\nswitch away from logging implementation names/details, since they\nare generally not relevant to developers.\n\nChange-Id: Iee605d182f241450f7e75a6d0c283d51fa1312f5\n" }, { "commit": "27eaec23881f9564f98b484765d000822de5fdc3", "tree": "2b958bb768b18ec0cff74e3b1e5949ba3b81f30b", "parents": [ "bee20cb560d37d23f2037c210152f9c44246ba8d", "842697a3602204036e991cfea8b74da3df6e7f14" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Tue Nov 18 21:37:59 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 18 21:37:59 2014 +0000" }, "message": "am 842697a3: am decc26df: am f0f68117: Merge \"Trace some interesting events\" into lmp-mr1-dev\n\n* commit \u0027842697a3602204036e991cfea8b74da3df6e7f14\u0027:\n Trace some interesting events\n" }, { "commit": "842697a3602204036e991cfea8b74da3df6e7f14", "tree": "6143113b63f3e52f443b6247a0611cb0c41042c1", "parents": [ "1ec9c526c1d45161887faf353f4dc36b582be813", "decc26df39b734ca1cbaccda1cbe3b355eba6898" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Tue Nov 18 21:33:19 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 18 21:33:19 2014 +0000" }, "message": "am decc26df: am f0f68117: Merge \"Trace some interesting events\" into lmp-mr1-dev\n\n* commit \u0027decc26df39b734ca1cbaccda1cbe3b355eba6898\u0027:\n Trace some interesting events\n" }, { "commit": "f0f68117c432edd5aea406e773ec5bd372976eec", "tree": "d4fc5ee2b10a3e2d191c21346cd6aa3e535351f8", "parents": [ "f984eb42724e66326549d7bf33a7ec1515a7ff3c", "fbc8df03e498baf47ff1a5e05e182f1bcd60c770" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Tue Nov 18 21:23:47 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 18 21:23:50 2014 +0000" }, "message": "Merge \"Trace some interesting events\" into lmp-mr1-dev" }, { "commit": "f7d0b20e9ed5727a9b9b1a0c0cc4fc7383a7859f", "tree": "5facc29f983d7d5c075c585336544430c9986292", "parents": [ "af71ab2c7ffed15fa7cd3f6dbd9306697075f6d1", "cb82b7f1824dc7f9fa73c2bada7107c48290af8b" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Mon Nov 17 23:07:29 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 17 23:07:29 2014 +0000" }, "message": "am cb82b7f1: am a58336f6: Merge \"Use fabsf() rather than abs()\"\n\n* commit \u0027cb82b7f1824dc7f9fa73c2bada7107c48290af8b\u0027:\n Use fabsf() rather than abs()\n" }, { "commit": "cb82b7f1824dc7f9fa73c2bada7107c48290af8b", "tree": "6bb3e3cd78bded34e48287ae20d13dc27e70491d", "parents": [ "804e2937e16943609c46ca3fe0cdbefab29f4210", "a58336f6c8aa44373485e5a6d7ec32677387a935" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Mon Nov 17 22:59:11 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 17 22:59:11 2014 +0000" }, "message": "am a58336f6: Merge \"Use fabsf() rather than abs()\"\n\n* commit \u0027a58336f6c8aa44373485e5a6d7ec32677387a935\u0027:\n Use fabsf() rather than abs()\n" }, { "commit": "c44958c78632162d2473ce3e86bef97f020ff4d0", "tree": "a604fb5cc165e49e4bf6b09e99ff905316db834d", "parents": [ "52e2b6f79d44ff289c97653edea0548352c2f55b" ], "author": { "name": "Bernhard Rosenkränzer", "email": "Bernhard.Rosenkranzer@linaro.org", "time": "Mon Nov 17 21:48:46 2014 +0100" }, "committer": { "name": "Bernhard Rosenkränzer", "email": "Bernhard.Rosenkranzer@linaro.org", "time": "Mon Nov 17 23:12:18 2014 +0100" }, "message": "Use fabsf() rather than abs()\n\nabs() operates on integers -- to check floats accurately, fabsf\nshould be used.\n\nChange-Id: I1a4e85f8f5e0d08ff38d307c5c31e2b6783ab7af\nSigned-off-by: Bernhard Rosenkränzer \u003cBernhard.Rosenkranzer@linaro.org\u003e\n" }, { "commit": "4f2e052f3d0b3a3c72f64b2cc044a9f6d4d031e2", "tree": "3e9a4fc83c0cdfff32c928bc025bb1b9d5066a2d", "parents": [ "7e23b3e7e1ee6501b57050583327bc2e88bd1ced", "a5f2e070741182ad9a6ebd489f844f444879c697" ], "author": { "name": "Rob Tsuk", "email": "robtsuk@google.com", "time": "Mon Nov 17 21:43:26 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 17 21:43:29 2014 +0000" }, "message": "Merge \"Fix uninitialized member warning\"" }, { "commit": "a5f2e070741182ad9a6ebd489f844f444879c697", "tree": "6c59af0594fdb58fc41b93a0614c33e5bd3497d9", "parents": [ "36f3b81440ff6d061f381bdd4a9a0f671ea8ea8a" ], "author": { "name": "Rob Tsuk", "email": "robtsuk@google.com", "time": "Mon Nov 17 12:57:32 2014 -0800" }, "committer": { "name": "Rob Tsuk", "email": "robtsuk@google.com", "time": "Mon Nov 17 12:57:32 2014 -0800" }, "message": "Fix uninitialized member warning\n\nThe fact that mHasDeferredTranslate was unitialized couldn\u0027t cause any\nproblems, since mTranslateX and mTranslateY are intialized to zero and\nthe only use of mHasDeferredTranslate, in\nDisplayListRenderer::flushTranslate(), doesn\u0027t do anything if those\nvalues are both zero and then sets mHasDeferredTranslate to false.\n\nChange-Id: Ia5aa2590b3ab956eaf74c90515353600253873f5\n" }, { "commit": "d97237071d503e2ca7104237b996edaa369b6f6d", "tree": "d63e14647b97b2ed0469dd79450d5cb22586428b", "parents": [ "e45f1cc3a78656203454a54c496556114fcedbf2", "11bdd5b10b5f921b657283fa94463263171218d5" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 17 20:27:32 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 17 20:27:32 2014 +0000" }, "message": "am 11bdd5b1: Merge commit \\\u002706d8b7b8\\\u0027 into manualmerge\n\n* commit \u002711bdd5b10b5f921b657283fa94463263171218d5\u0027:\n Implement back-tracking when searching for attributes in XML or resource bag\n" }, { "commit": "11bdd5b10b5f921b657283fa94463263171218d5", "tree": "f439482e80559f310178bb050de770ca86fb0b23", "parents": [ "a9a3e24835b08828aa252bf079067a5f810a0792", "06d8b7b8d216cbfcd4cd987649672a5856ccd797" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 17 12:17:16 2014 -0800" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 17 12:17:16 2014 -0800" }, "message": "Merge commit \u002706d8b7b8\u0027 into manualmerge\n\nConflicts:\n\tcore/jni/android_util_AssetManager.cpp\n\nChange-Id: I77b72d0d3ec8184ccd97419e4c76b7d55b1a52ca\n" }, { "commit": "cd6f00c3a05717862a88b7409d11176ae53fd9a9", "tree": "0c5eee8aacc85e7722dcde4efee625da3782a58a", "parents": [ "cd75f59f8cdeda95a50155ad0c9f4abd559037ec", "a7d1d73a477fe512d9ea69ee2883084630ec24c4" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Nov 17 19:39:15 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 17 19:39:17 2014 +0000" }, "message": "Merge \"Implement back-tracking when searching for attributes in XML or resource bag\" into lmp-mr1-dev" }, { "commit": "e726680652ecd235496afeb3207b463e0aa83955", "tree": "baf93d27f595a5be32d77c377d7571985a1a9ca1", "parents": [ "101bf2a0883d0b799c9c515af4e2297d0cf21394", "52e2b6f79d44ff289c97653edea0548352c2f55b" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Nov 17 18:24:54 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 17 18:24:54 2014 +0000" }, "message": "am 52e2b6f7: Merge \"Update calls to IInterface::asBinder()\"\n\n* commit \u002752e2b6f79d44ff289c97653edea0548352c2f55b\u0027:\n Update calls to IInterface::asBinder()\n" }, { "commit": "fbc8df03e498baf47ff1a5e05e182f1bcd60c770", "tree": "de74f95227f7285e812ad4a0c009e697fcca7d6a", "parents": [ "b3ec64e1005c82d41b6d1a1d86b6933fd25d87d2" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Fri Nov 14 16:18:41 2014 -0800" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Mon Nov 17 10:18:31 2014 -0800" }, "message": "Trace some interesting events\n\nBug: 18337099\nChange-Id: Ie2e60da2b9f06e0368061c944d8123ab6903355c\n" }, { "commit": "97069dd4fd5454ba057ccf2854d7f925c337884c", "tree": "f7c7bb19f779c48dedfea40c7fb05f25699d7496", "parents": [ "34c495d2e9d873aeb7e3d86077f0ef4b8d8993b6" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 14 08:00:42 2014 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Nov 17 10:05:31 2014 -0800" }, "message": "Update calls to IInterface::asBinder()\n\nto use the new static version.\n\nChange-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a\n" }, { "commit": "ddaf804f732dab7eef97512015e96e8f6877439b", "tree": "b0992335935de2af2a32f3f7dc43c24c4eac5a2a", "parents": [ "7010d230ca1951d4c928104df76ca2460514b59a", "57f81b86a26db570ee85567b35fd1af681b5b9b3" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Sun Nov 16 17:44:00 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Nov 16 17:44:03 2014 +0000" }, "message": "Merge \"Move hwui tests to libc++.\"" }, { "commit": "57f81b86a26db570ee85567b35fd1af681b5b9b3", "tree": "d874c48a3d3560613e4236b9b78896d03d6e3079", "parents": [ "3269eb67a7accf90ccfd3885fa63ea9c8c569823" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Sat Nov 15 18:29:03 2014 -0800" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Sat Nov 15 18:29:03 2014 -0800" }, "message": "Move hwui tests to libc++.\n\nBug: 15193147\nChange-Id: I9a3a4104c49810173cbf59e0023baafc4693dd3f\n" }, { "commit": "dce97407dcf54ae9725c2d29224f6ed8dfd994b8", "tree": "f406dd4c41ded26993995f0409f15530f144d16c", "parents": [ "a710c7444b1a17b3fc9b2abf4fba0987482d6c47" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 14 08:00:42 2014 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 14 14:02:09 2014 -0800" }, "message": "Update calls to IInterface::asBinder()\n\nto use the new static version.\n\nChange-Id: I88ee037c66aa254f466d3a51ddc358bd37cf44b5\n" }, { "commit": "08ad1b05d2fc48efa380e38317ff5b6ae0232df5", "tree": "2fa4c938ef39b1e10e3679a3fcad33b502aaf124", "parents": [ "95e5a82e1d3743778218fb7b94389f8a5622809a", "cc3cfdbe8a1bae75a2033f7f79cbc30c9b4accad" ], "author": { "name": "Rob Tsuk", "email": "robtsuk@google.com", "time": "Thu Nov 13 17:38:22 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 13 17:38:24 2014 +0000" }, "message": "Merge \"Fix warnings in hwiu test app\"" }, { "commit": "95e5a82e1d3743778218fb7b94389f8a5622809a", "tree": "0afa44036ff71aa8f019a27fc29f63ff42571f28", "parents": [ "724bfa3e14ab04ffc8ccf034a6d17443e6a6c902", "c495e611b9fa1fc6b47a647c714bbbf94dd63461" ], "author": { "name": "Rob Tsuk", "email": "robtsuk@google.com", "time": "Thu Nov 13 17:17:02 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 13 17:17:06 2014 +0000" }, "message": "Merge \"Add a way to override Xfermode\"" }, { "commit": "cc3cfdbe8a1bae75a2033f7f79cbc30c9b4accad", "tree": "0232819a454744377cc25ab86ba3a293298e2782", "parents": [ "d71152fc8d21b0fdac9617aea76395f6bd850014" ], "author": { "name": "Rob Tsuk", "email": "robtsuk@google.com", "time": "Wed Nov 12 16:23:03 2014 -0800" }, "committer": { "name": "Rob Tsuk", "email": "robtsuk@google.com", "time": "Wed Nov 12 16:24:59 2014 -0800" }, "message": "Fix warnings in hwiu test app\n\nSo it\u0027s easier to see warnings about actual\nproblems with new changes.\n\nChange-Id: I992711bf12bb25fbfd87fcab15993d5c5f66f46c\n" }, { "commit": "952de42b454945c87f21a9612c7a3457afced171", "tree": "1506b90d9f0a77c584a5e52f29ddfdd45e6b412d", "parents": [ "74a2d7695eebd32fd3451160c7c9ac30d294abe4", "5679d937ff033ff1fa86245d646b6e5dbf23d635" ], "author": { "name": "ztenghui", "email": "ztenghui@google.com", "time": "Wed Nov 12 23:59:49 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 12 23:59:49 2014 +0000" }, "message": "am 5679d937: am ab6515f6: am 4e50ee4f: Merge \"Shadow: Fix the crash in spot shadow\" into lmp-mr1-dev\n\n* commit \u00275679d937ff033ff1fa86245d646b6e5dbf23d635\u0027:\n Shadow: Fix the crash in spot shadow\n" }, { "commit": "c495e611b9fa1fc6b47a647c714bbbf94dd63461", "tree": "c5b01261394791c4e72842bdb451b2e29efca916", "parents": [ "d71152fc8d21b0fdac9617aea76395f6bd850014" ], "author": { "name": "Rob Tsuk", "email": "robtsuk@google.com", "time": "Tue Nov 11 15:44:13 2014 -0800" }, "committer": { "name": "Rob Tsuk", "email": "robtsuk@google.com", "time": "Wed Nov 12 15:49:45 2014 -0800" }, "message": "Add a way to override Xfermode\n\nAdd a non-public API to Canvas/GLES20Canvas to provide a way to draw\nthe touch ripple animation without using a save layer.\n\nBug: 18226391\nChange-Id: I6f8fb8938505e976892c4e14f6f864362c43e73c\n" }, { "commit": "6552afa87833a36b37c715acd40e494fe4de2019", "tree": "edad23ebcd7af0d3b4d3534147310970772ccf28", "parents": [ "fd003c707e57326a463acd31c232fc9ad306ec92", "ccc956b2b4602dca28f7c79d1155df29bcc0d696" ], "author": { "name": "Rob Tsuk", "email": "robtsuk@google.com", "time": "Wed Nov 12 23:49:19 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 12 23:49:19 2014 +0000" }, "message": "am ccc956b2: am 41a8043b: Merge \"Add a way to override Xfermode DO NOT MERGE\" into lmp-mr1-dev\n\n* commit \u0027ccc956b2b4602dca28f7c79d1155df29bcc0d696\u0027:\n Add a way to override Xfermode DO NOT MERGE\n" }, { "commit": "5679d937ff033ff1fa86245d646b6e5dbf23d635", "tree": "89e086cf86fc4ed2e0b7fe672c7e2807400cd6fe", "parents": [ "c3e29108fcd87b8229cddacec98e63fe5f79efdf", "ab6515f6214a09e23deee4b432b41d1849ae403f" ], "author": { "name": "ztenghui", "email": "ztenghui@google.com", "time": "Wed Nov 12 23:49:08 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 12 23:49:08 2014 +0000" }, "message": "am ab6515f6: am 4e50ee4f: Merge \"Shadow: Fix the crash in spot shadow\" into lmp-mr1-dev\n\n* commit \u0027ab6515f6214a09e23deee4b432b41d1849ae403f\u0027:\n Shadow: Fix the crash in spot shadow\n" }, { "commit": "41a8043b30a289bdba55a2469e598b3fe67c3bf1", "tree": "b12a667d1c85a19a4722c111fdc63adc30cd6d5a", "parents": [ "10ece9c9d5c2134a6ea04bf593a2b76d167dbd7a", "4678dcc5524258908eadc5fe1e5e1874768967eb" ], "author": { "name": "Rob Tsuk", "email": "robtsuk@google.com", "time": "Wed Nov 12 21:41:58 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 12 21:42:00 2014 +0000" }, "message": "Merge \"Add a way to override Xfermode DO NOT MERGE\" into lmp-mr1-dev" }, { "commit": "45670c1dc55c3d853c03a252623428aeffa731e7", "tree": "f8aea770e319fae0b46673fe55e127aed8ef7be4", "parents": [ "a41f29cc000680f402d51972dfad0a46c5a3cb07", "b28ff487fb6db4a44e4d18aa17d8253f00a63bb6" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Wed Nov 12 21:31:33 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 12 21:31:33 2014 +0000" }, "message": "am b28ff487: resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp\n\n* commit \u0027b28ff487fb6db4a44e4d18aa17d8253f00a63bb6\u0027:\n Move frameworks/base over to libc++.\n" }, { "commit": "b28ff487fb6db4a44e4d18aa17d8253f00a63bb6", "tree": "3e86f055fb0dd069bc41ba7c1270780fa34e9aaf", "parents": [ "56dd295b69a78017baf44491cb27fcaaf8101f1c", "5e6cf24213c5eacc9d3e3c8da5826be4a23f22af" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Wed Nov 12 13:24:42 2014 -0800" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Wed Nov 12 13:24:42 2014 -0800" }, "message": "resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp\n\nChange-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9\n" }, { "commit": "4e50ee4f42e4fdf753b9f681a6236f4a46e25bb0", "tree": "1329db40727ed39d52619c6609733b77aab487fe", "parents": [ "ffcb5e210ad82e0f2a33d6644bc6690552a1785f", "3932063bc75dc1e4efc2c428ca208d2e2290164d" ], "author": { "name": "ztenghui", "email": "ztenghui@google.com", "time": "Wed Nov 12 21:16:26 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 12 21:16:31 2014 +0000" }, "message": "Merge \"Shadow: Fix the crash in spot shadow\" into lmp-mr1-dev" }, { "commit": "5e6cf24213c5eacc9d3e3c8da5826be4a23f22af", "tree": "f1832a5cad77c92bb4f60344c28e82d0cc3f633f", "parents": [ "6e5b14c411f7ebdae610c1074e7d4d2d5d2a9550", "ff1d8a6635fb6441615778a47e2881129574a5b1" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Wed Nov 12 21:11:48 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Nov 12 21:11:49 2014 +0000" }, "message": "Merge \"Move frameworks/base over to libc++.\"" }, { "commit": "3932063bc75dc1e4efc2c428ca208d2e2290164d", "tree": "19ed4e4667c55661c4e7bd301cc2f8deca2c5a51", "parents": [ "f4d2c8eebd8113482b48e0b8f83deb4b2f1f9b22" ], "author": { "name": "ztenghui", "email": "ztenghui@google.com", "time": "Wed Nov 12 10:56:15 2014 -0800" }, "committer": { "name": "ztenghui", "email": "ztenghui@google.com", "time": "Wed Nov 12 12:58:08 2014 -0800" }, "message": "Shadow: Fix the crash in spot shadow\n\nFix the crash from searching for closest umbra vertex by initialized the\nstarting index correctly.\n\nFix another potential crash related to ray intersection by introducing epsilon.\n\nb/18315089\n\nChange-Id: I9ac9a781a885701a8388714d44f79a1d905e5d33\n" }, { "commit": "a41f29cc000680f402d51972dfad0a46c5a3cb07", "tree": "30d930c7e79e72b163b9a7c8cafa5ea5ed38bbc7", "parents": [ "d71152fc8d21b0fdac9617aea76395f6bd850014" ], "author": { "name": "Dan Stoza", "email": "stoza@google.com", "time": "Wed Nov 12 12:35:42 2014 -0800" }, "committer": { "name": "Dan Stoza", "email": "stoza@google.com", "time": "Wed Nov 12 12:35:42 2014 -0800" }, "message": "Change GraphicBuffer fields from uint to int\n\nThis changes fields which are tracking GraphicBuffer width and height\nto use int instead of uint32_t, which is in keeping with a recent\nchange to GraphicBuffer itself and avoids a warning (error since this\nbuild uses -Werror).\n\nChange-Id: I66c5c3e3d321d4ef5ea2c40c86ac068111c18662\n" }, { "commit": "4678dcc5524258908eadc5fe1e5e1874768967eb", "tree": "3f1ca293c68326003fef888ef70c57075c885fe9", "parents": [ "82aaf332b62c5a276c4046d1339441d68d817371" ], "author": { "name": "Rob Tsuk", "email": "robtsuk@google.com", "time": "Tue Nov 11 15:44:13 2014 -0800" }, "committer": { "name": "Rob Tsuk", "email": "robtsuk@google.com", "time": "Wed Nov 12 12:25:24 2014 -0800" }, "message": "Add a way to override Xfermode DO NOT MERGE\n\nAdd a non-public API to Canvas/GLES20Canvas to provide a way to draw\nthe touch ripple animation without using a save layer.\n\nChange-Id: I6e2095adffe515194f669fb75bb67abf813bd518\n" }, { "commit": "ff1d8a6635fb6441615778a47e2881129574a5b1", "tree": "d2f490ec6a546461eda288e4383a50796d68059c", "parents": [ "34acb4c8d4abe1c4f580b85ddc84b18b7e38e417" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Tue Nov 11 19:31:26 2014 -0800" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Wed Nov 12 11:22:20 2014 -0800" }, "message": "Move frameworks/base over to libc++.\n\nBug: 15193147\nChange-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e\n" }, { "commit": "586c36780e4251d611965e19df95a7b7f0c96381", "tree": "6d759252599bc40fe1689013478d81095bc48199", "parents": [ "ca462ded8a5d64e39c0e1dc33aad70d6aca0fd1f", "7be350d2cf4415ee08f628ffe1b06f5f17a71411" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Wed Nov 12 17:44:49 2014 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 12 17:44:49 2014 +0000" }, "message": "am b93f8d02: Merge \"Frameworks/base: Wall Werror in common_time\"\nautomerge: 7be350d\n\n* commit \u00277be350d2cf4415ee08f628ffe1b06f5f17a71411\u0027:\n Frameworks/base: Wall Werror in common_time\n" }, { "commit": "7be350d2cf4415ee08f628ffe1b06f5f17a71411", "tree": "ebfc4327e32e79624d06e2ab03f5e28489d7c6c9", "parents": [ "0dea93c0ca1d4ec03fa641d19a25f1267165eecd", "b93f8d02f886d078b268fe5fd61a95f6911c2644" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Wed Nov 12 17:42:50 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 12 17:42:50 2014 +0000" }, "message": "am b93f8d02: Merge \"Frameworks/base: Wall Werror in common_time\"\n\n* commit \u0027b93f8d02f886d078b268fe5fd61a95f6911c2644\u0027:\n Frameworks/base: Wall Werror in common_time\n" } ], "next": "b93f8d02f886d078b268fe5fd61a95f6911c2644" }