)]}' { "log": [ { "commit": "fc41a7547f0b0bb4491a37bec7f004baf2778de1", "tree": "9183edf23d8a51d697462596efe8d68f92f979c0", "parents": [ "bb0e530af2549835a31ed66846c3923590cfba8b", "7eee3ce3114a7e0f91f91dc74c26677300c0ec71" ], "author": { "name": "Tim Murray", "email": "timmurray@google.com", "time": "Wed Sep 26 16:56:54 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 16:56:54 2012 -0700" }, "message": "am 7eee3ce3: am c31c5433: Merge \"fix blend intrinsics, add tests\" into jb-mr1-dev\n\n* commit \u00277eee3ce3114a7e0f91f91dc74c26677300c0ec71\u0027:\n fix blend intrinsics, add tests\n" }, { "commit": "7eee3ce3114a7e0f91f91dc74c26677300c0ec71", "tree": "59313e69549fba43bb8dfc69a07504d6b9cb16d6", "parents": [ "e1dcab3f78ce0a399fc4509d793ab47bc68e1602", "c31c54332ece2053f8c03fa171d8702234f13df7" ], "author": { "name": "Tim Murray", "email": "timmurray@google.com", "time": "Wed Sep 26 16:54:34 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 16:54:34 2012 -0700" }, "message": "am c31c5433: Merge \"fix blend intrinsics, add tests\" into jb-mr1-dev\n\n* commit \u0027c31c54332ece2053f8c03fa171d8702234f13df7\u0027:\n fix blend intrinsics, add tests\n" }, { "commit": "bb0e530af2549835a31ed66846c3923590cfba8b", "tree": "b54e6b87e4b2196dbb5ec1fb5e95a7a0378deb5e", "parents": [ "b66e30373c1c0ed2496032aafe6820b148a6b3fc", "e1dcab3f78ce0a399fc4509d793ab47bc68e1602" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Wed Sep 26 16:53:52 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 16:53:52 2012 -0700" }, "message": "am e1dcab3f: am 244a0bca: Merge \"Make gradients beautiful again Bug #7239634\" into jb-mr1-dev\n\n* commit \u0027e1dcab3f78ce0a399fc4509d793ab47bc68e1602\u0027:\n Make gradients beautiful again Bug #7239634\n" }, { "commit": "c31c54332ece2053f8c03fa171d8702234f13df7", "tree": "59313e69549fba43bb8dfc69a07504d6b9cb16d6", "parents": [ "244a0bcadc167ed8519c7e34c62e116c1adc2dbe", "74478f73b7ecf5c6bceb214b2704184ad9e2e0ec" ], "author": { "name": "Tim Murray", "email": "timmurray@google.com", "time": "Wed Sep 26 16:52:20 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 16:52:21 2012 -0700" }, "message": "Merge \"fix blend intrinsics, add tests\" into jb-mr1-dev" }, { "commit": "e1dcab3f78ce0a399fc4509d793ab47bc68e1602", "tree": "dd2ec331c91601b3925e90f4e0bb0b669099b3ca", "parents": [ "0b6cb84b909c40ceeb37cbcf2ce82a2b0129be7a", "244a0bcadc167ed8519c7e34c62e116c1adc2dbe" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Wed Sep 26 16:51:31 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 16:51:31 2012 -0700" }, "message": "am 244a0bca: Merge \"Make gradients beautiful again Bug #7239634\" into jb-mr1-dev\n\n* commit \u0027244a0bcadc167ed8519c7e34c62e116c1adc2dbe\u0027:\n Make gradients beautiful again Bug #7239634\n" }, { "commit": "244a0bcadc167ed8519c7e34c62e116c1adc2dbe", "tree": "dd2ec331c91601b3925e90f4e0bb0b669099b3ca", "parents": [ "13987fb43255ccb3802d415e32b1c5caf14291bb", "39284b763a09688468ed3799ebd2ebb76ea5dfd5" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Wed Sep 26 16:49:28 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 16:49:29 2012 -0700" }, "message": "Merge \"Make gradients beautiful again Bug #7239634\" into jb-mr1-dev" }, { "commit": "39284b763a09688468ed3799ebd2ebb76ea5dfd5", "tree": "b67c139bf0552ff066a4eafb9e29deae62924075", "parents": [ "bd43152bda835c5a9a619a5869344a6a3af11917" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Wed Sep 26 16:39:40 2012 -0700" }, "committer": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Wed Sep 26 16:39:40 2012 -0700" }, "message": "Make gradients beautiful again\nBug #7239634\n\nThis change passes two matrices to the vertex shader instead of one.\nWe used to compute the final MVP matrix on the CPU to minimize the\nnumber of operations in the vertex shaders. Shader compilers are\nhowever smart enough to perform this optimization for us. Since we\nneed the MV matrix to properly compute gradients dithering, this\nchange splits the MVP matrix into two. This has the advantage of\nremoving one matrix multiplication per drawing operation on the\nCPU.\nThe SGX 540 shader compiler produces the same number of instructions\nin both cases. There is no penalty hit with having two matrices\ninstead of one. We also send so few vertices per frame that it\ndoes not matter very much.\n\nChange-Id: I17d47ac4772615418e0e1885b97493d31435a936\n" }, { "commit": "74478f73b7ecf5c6bceb214b2704184ad9e2e0ec", "tree": "e85e16245b0cbd37d64ef63b0174df1d620837fe", "parents": [ "fea9df6386d66089b004719f194625e159bb344a" ], "author": { "name": "Tim Murray", "email": "timmurray@google.com", "time": "Wed Sep 26 13:46:46 2012 -0700" }, "committer": { "name": "Tim Murray", "email": "timmurray@google.com", "time": "Wed Sep 26 16:29:08 2012 -0700" }, "message": "fix blend intrinsics, add tests\n\nBug: 7190126\nChange-Id: If69213377282bf5b412508e7af974a1f8d440287\n" }, { "commit": "b66e30373c1c0ed2496032aafe6820b148a6b3fc", "tree": "26bd9bf2b41b81f668640cd1c3f52677e96a737d", "parents": [ "574fbc738d48456479daf6788a4e103484ff8694", "0b6cb84b909c40ceeb37cbcf2ce82a2b0129be7a" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Sep 26 16:09:29 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 16:09:29 2012 -0700" }, "message": "am 0b6cb84b: am 13987fb4: Merge \"Reverting public setSoWriteTimeout\" into jb-mr1-dev\n\n* commit \u00270b6cb84b909c40ceeb37cbcf2ce82a2b0129be7a\u0027:\n Reverting public setSoWriteTimeout\n" }, { "commit": "574fbc738d48456479daf6788a4e103484ff8694", "tree": "7dde2f08eec088d9766879f99cb5501870fc897b", "parents": [ "3cc8211ecd61c8568f182de5fb615d880e889ff9", "c73f3d5cea18b1688a119658680b489ef7621dd2" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 26 16:07:44 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 16:07:44 2012 -0700" }, "message": "am c73f3d5c: am 7b879999: Merge \"Fix issue #7238170: Edit picture option is not available for the secondary user.\" into jb-mr1-dev\n\n* commit \u0027c73f3d5cea18b1688a119658680b489ef7621dd2\u0027:\n Fix issue #7238170: Edit picture option is not available for the secondary user.\n" }, { "commit": "0b6cb84b909c40ceeb37cbcf2ce82a2b0129be7a", "tree": "84e46d95605b6cf753a65a0ffbaf2d84ab40d4cf", "parents": [ "c73f3d5cea18b1688a119658680b489ef7621dd2", "13987fb43255ccb3802d415e32b1c5caf14291bb" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Sep 26 16:07:19 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 16:07:19 2012 -0700" }, "message": "am 13987fb4: Merge \"Reverting public setSoWriteTimeout\" into jb-mr1-dev\n\n* commit \u002713987fb43255ccb3802d415e32b1c5caf14291bb\u0027:\n Reverting public setSoWriteTimeout\n" }, { "commit": "c73f3d5cea18b1688a119658680b489ef7621dd2", "tree": "0ae52626114eb07c5c71e5e9f2057e83f6cfb164", "parents": [ "cbc289ae0c15a70eb6b4b611b23761159059f153", "7b879999fe2bef549ed1c04259fcd7f07e10e83b" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 26 16:05:35 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 16:05:35 2012 -0700" }, "message": "am 7b879999: Merge \"Fix issue #7238170: Edit picture option is not available for the secondary user.\" into jb-mr1-dev\n\n* commit \u00277b879999fe2bef549ed1c04259fcd7f07e10e83b\u0027:\n Fix issue #7238170: Edit picture option is not available for the secondary user.\n" }, { "commit": "13987fb43255ccb3802d415e32b1c5caf14291bb", "tree": "84e46d95605b6cf753a65a0ffbaf2d84ab40d4cf", "parents": [ "7b879999fe2bef549ed1c04259fcd7f07e10e83b", "992f238d13fff7c21b60ef6958784a4ed2156784" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Sep 26 16:05:00 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 16:05:00 2012 -0700" }, "message": "Merge \"Reverting public setSoWriteTimeout\" into jb-mr1-dev" }, { "commit": "7b879999fe2bef549ed1c04259fcd7f07e10e83b", "tree": "0ae52626114eb07c5c71e5e9f2057e83f6cfb164", "parents": [ "bf184875ef4dc41024474840641c6fc9d3a9e975", "4d5c2b03172747843d0549eeea890150a705b86b" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 26 16:03:06 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 16:03:06 2012 -0700" }, "message": "Merge \"Fix issue #7238170: Edit picture option is not available for the secondary user.\" into jb-mr1-dev" }, { "commit": "992f238d13fff7c21b60ef6958784a4ed2156784", "tree": "da0adb900f6a84ab8f05651acc16d35d1788c366", "parents": [ "4e1ab15b305aac26ad8819fc3b2951e20985944d" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Sep 26 14:33:47 2012 -0700" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Sep 26 15:48:21 2012 -0700" }, "message": "Reverting public setSoWriteTimeout\n\nThis reverts fd901f735c858af8ec8884b2e7ab71a46a9639e6 and 5e21bf934b2a71b595deb9856a2044eea4dbce86\n\nBug: 7237764\nBug: 6693087\nChange-Id: I7cc9657e4df219481eb33de803081a01b13ee0f2\n" }, { "commit": "3cc8211ecd61c8568f182de5fb615d880e889ff9", "tree": "f27ea629150ba008150ad08ad93d53158e68d4de", "parents": [ "9848c2c6b43918c08633a0b641f7f9ecf6f03bdc", "cbc289ae0c15a70eb6b4b611b23761159059f153" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Wed Sep 26 15:32:55 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 15:32:55 2012 -0700" }, "message": "am cbc289ae: am bf184875: Merge \"Fix adjustViewBounds handling for ImageView\" into jb-mr1-dev\n\n* commit \u0027cbc289ae0c15a70eb6b4b611b23761159059f153\u0027:\n Fix adjustViewBounds handling for ImageView\n" }, { "commit": "cbc289ae0c15a70eb6b4b611b23761159059f153", "tree": "09e424327af34cd4ac7938e4716bc1020d6ee056", "parents": [ "4a2357b63458380e94dc57942b4be11c490af8fe", "bf184875ef4dc41024474840641c6fc9d3a9e975" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Wed Sep 26 15:30:46 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 15:30:46 2012 -0700" }, "message": "am bf184875: Merge \"Fix adjustViewBounds handling for ImageView\" into jb-mr1-dev\n\n* commit \u0027bf184875ef4dc41024474840641c6fc9d3a9e975\u0027:\n Fix adjustViewBounds handling for ImageView\n" }, { "commit": "bf184875ef4dc41024474840641c6fc9d3a9e975", "tree": "09e424327af34cd4ac7938e4716bc1020d6ee056", "parents": [ "51ce1607b392bf463e4175596d0b91dc337f4c14", "b1271ac183c36d0e9e3a524bec8908ed5aab9a45" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Wed Sep 26 15:28:51 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 15:28:52 2012 -0700" }, "message": "Merge \"Fix adjustViewBounds handling for ImageView\" into jb-mr1-dev" }, { "commit": "b1271ac183c36d0e9e3a524bec8908ed5aab9a45", "tree": "239a1cac72d56c36e1a843bb65dcf88755956834", "parents": [ "4368ba45adebf17d7962ad551363ac302cb2b1c7" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Wed Sep 26 15:21:39 2012 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Wed Sep 26 15:21:39 2012 -0700" }, "message": "Fix adjustViewBounds handling for ImageView\n\nWhen computing the adjusted view bounds, don\u0027t constrain the\ndimensions by the original estimate. This can result in the view never\ngetting properly enlarged.\n\nBug 7240251\n\nChange-Id: I44fc017f8b661121f0042fcd59a4efde70be6bbe\n" }, { "commit": "9848c2c6b43918c08633a0b641f7f9ecf6f03bdc", "tree": "2fecd4a798e5846daa8c7fe82bbdfb39922d0775", "parents": [ "8a5a52ce7970afba12a3ec576a3f32c27fd3745d", "4a2357b63458380e94dc57942b4be11c490af8fe" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Sep 26 15:17:27 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 15:17:27 2012 -0700" }, "message": "am 4a2357b6: (-s ours) am 51ce1607: am 46cc524a: (-s ours) am f7243dcc: Add --error-on-failed-insert option to aapt. do not merge.\n\n* commit \u00274a2357b63458380e94dc57942b4be11c490af8fe\u0027:\n Add --error-on-failed-insert option to aapt. do not merge.\n" }, { "commit": "4a2357b63458380e94dc57942b4be11c490af8fe", "tree": "3cd057a4a43c91962eb591e308cfc821ab002cf4", "parents": [ "6abc86abb653cba8fda9be18c4715091f49868ec", "51ce1607b392bf463e4175596d0b91dc337f4c14" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Sep 26 15:15:43 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 15:15:43 2012 -0700" }, "message": "am 51ce1607: am 46cc524a: (-s ours) am f7243dcc: Add --error-on-failed-insert option to aapt. do not merge.\n\n* commit \u002751ce1607b392bf463e4175596d0b91dc337f4c14\u0027:\n Add --error-on-failed-insert option to aapt. do not merge.\n" }, { "commit": "51ce1607b392bf463e4175596d0b91dc337f4c14", "tree": "3cd057a4a43c91962eb591e308cfc821ab002cf4", "parents": [ "834fc23d0d151863afb8cda14084fe0e4dd8abd8", "46cc524a6c45d169750290f06672ee6343af51d7" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Sep 26 15:14:19 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 15:14:19 2012 -0700" }, "message": "am 46cc524a: (-s ours) am f7243dcc: Add --error-on-failed-insert option to aapt. do not merge.\n\n* commit \u002746cc524a6c45d169750290f06672ee6343af51d7\u0027:\n Add --error-on-failed-insert option to aapt. do not merge.\n" }, { "commit": "46cc524a6c45d169750290f06672ee6343af51d7", "tree": "6aa18a4484fb99d0624eabcaf37dfb30812ac875", "parents": [ "44c564f251653286f3d2b8608ff5fccba39e831f", "f7243dcc616bc9bd84fa519356babb15d6f17e7d" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Sep 26 15:12:13 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 15:12:13 2012 -0700" }, "message": "am f7243dcc: Add --error-on-failed-insert option to aapt. do not merge.\n\n* commit \u0027f7243dcc616bc9bd84fa519356babb15d6f17e7d\u0027:\n Add --error-on-failed-insert option to aapt. do not merge.\n" }, { "commit": "4d5c2b03172747843d0549eeea890150a705b86b", "tree": "3f2ac9573dff64a7357c815c0f40923846c0ceb9", "parents": [ "2fd6cb043901c1bfbf5f566d13522cc3c1c21fb4" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 26 15:10:30 2012 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 26 15:10:30 2012 -0700" }, "message": "Fix issue #7238170: Edit picture option is not available for the secondary user.\n\nChange-Id: Icb3229f543f286afb4a31e267099eceaa0cca11d\n" }, { "commit": "8a5a52ce7970afba12a3ec576a3f32c27fd3745d", "tree": "2fecd4a798e5846daa8c7fe82bbdfb39922d0775", "parents": [ "c14a9113c5b3bf3a5b6d2f888d6669e8bc54b342", "6abc86abb653cba8fda9be18c4715091f49868ec" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 26 15:07:35 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 15:07:35 2012 -0700" }, "message": "am 6abc86ab: am 834fc23d: Merge \"More activity tests.\" into jb-mr1-dev\n\n* commit \u00276abc86abb653cba8fda9be18c4715091f49868ec\u0027:\n More activity tests.\n" }, { "commit": "f7243dcc616bc9bd84fa519356babb15d6f17e7d", "tree": "3e0059ad9d14ccf1e8c76d8c8d5961e7f053385c", "parents": [ "d8104d9b3debad8c960a302972488e5157702618" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Sep 05 17:49:21 2012 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Sep 26 15:05:22 2012 -0700" }, "message": "Add --error-on-failed-insert option to aapt. do not merge.\n\nThe new SDK build system give the ability to insert\nversionCode/Name and min/targetSdkVersion in the manifest\nbut aapt won\u0027t replace those if they already exist.\n\nThe main problem is that aapt doesn\u0027t actually fail when\nit doesn\u0027t replace them, making the output not what the\ndeveloper wanted.\n\nThis patch set adds an option to aapt to make it return\nan error if the insert failed because the attribute\nalready existed.\n\nCherry-pick from 7714a2429b192c88e134ff67b969121bbaeb5457\n\nChange-Id: I8938ec1238da407a8562c974e9598db39001ffd9\n" }, { "commit": "6abc86abb653cba8fda9be18c4715091f49868ec", "tree": "3cd057a4a43c91962eb591e308cfc821ab002cf4", "parents": [ "e440f47d95cefe02bc76d6b57d6e2b248b052f93", "834fc23d0d151863afb8cda14084fe0e4dd8abd8" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 26 15:04:44 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 15:04:44 2012 -0700" }, "message": "am 834fc23d: Merge \"More activity tests.\" into jb-mr1-dev\n\n* commit \u0027834fc23d0d151863afb8cda14084fe0e4dd8abd8\u0027:\n More activity tests.\n" }, { "commit": "834fc23d0d151863afb8cda14084fe0e4dd8abd8", "tree": "3cd057a4a43c91962eb591e308cfc821ab002cf4", "parents": [ "e521573097390ce5465fc9b88dee2ae62f2317c6", "3992645bf333c56669ef2fa19c26b2947884a4f3" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 26 15:01:39 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 15:01:40 2012 -0700" }, "message": "Merge \"More activity tests.\" into jb-mr1-dev" }, { "commit": "c14a9113c5b3bf3a5b6d2f888d6669e8bc54b342", "tree": "6e2deb36b1792c6c7c29ac8a6db66c1e14b5aa82", "parents": [ "5d7b4368d9eece9f78c808fbda5b59700bfe6671", "e440f47d95cefe02bc76d6b57d6e2b248b052f93" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 26 15:00:23 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 15:00:23 2012 -0700" }, "message": "am e440f47d: am e5215730: Merge \"Maybe fix issue #7211766: bindService() to User u0 While u10 is...\" into jb-mr1-dev\n\n* commit \u0027e440f47d95cefe02bc76d6b57d6e2b248b052f93\u0027:\n Maybe fix issue #7211766: bindService() to User u0 While u10 is...\n" }, { "commit": "e440f47d95cefe02bc76d6b57d6e2b248b052f93", "tree": "3e43f20c2f0f750fa58c1c6d0854b7fe4cac81d5", "parents": [ "bbe1860ae38b96d4d347990d1fb857e978828224", "e521573097390ce5465fc9b88dee2ae62f2317c6" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 26 14:57:49 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 14:57:49 2012 -0700" }, "message": "am e5215730: Merge \"Maybe fix issue #7211766: bindService() to User u0 While u10 is...\" into jb-mr1-dev\n\n* commit \u0027e521573097390ce5465fc9b88dee2ae62f2317c6\u0027:\n Maybe fix issue #7211766: bindService() to User u0 While u10 is...\n" }, { "commit": "e521573097390ce5465fc9b88dee2ae62f2317c6", "tree": "3e43f20c2f0f750fa58c1c6d0854b7fe4cac81d5", "parents": [ "62fbb8311a1fe84fd1b09e27169757c85d7933cb", "b12e1354f25f04e9c9a71da76c6fca858b7d39d0" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 26 14:55:18 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 14:55:19 2012 -0700" }, "message": "Merge \"Maybe fix issue #7211766: bindService() to User u0 While u10 is...\" into jb-mr1-dev" }, { "commit": "b12e1354f25f04e9c9a71da76c6fca858b7d39d0", "tree": "3568c1a0ce0a3348fbfcb4d5773140f26f630f80", "parents": [ "2fd6cb043901c1bfbf5f566d13522cc3c1c21fb4" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 26 11:39:20 2012 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 26 14:50:12 2012 -0700" }, "message": "Maybe fix issue #7211766: bindService() to User u0 While u10 is...\n\n...Forground Sometimes Doesn\u0027t Take\n\nThe main change here is a one-liner in ActiveServices to check the\nuid when deciding whether to remove an item from mPendingServices.\nThis could cause the problem being seen -- if the same service for\ntwo users is starting at the same time, the second one would blow\naway the pending start of the first one. Unfortunately I have had\ntrouble reproducing the bug, so I don\u0027t know if this is actually\nfixing it. It\u0027s a bug, anyway.\n\nThe reason so much has changed here is because I spread around\nlogging and printing of the user ID associated with operations and\nobjects to make it easier to debug these kind of multi-user things.\n\nAlso includes some tweaks to the oom manager to allow more background\nprocesses (I have seen many times in logs where we thrash through\nprocesses because the LRU list is too short), plus to compensate an\nadditional time-based metric for when to get rid of background processes,\nplus some new logic to try to help things like Chrome keep around\ntheir service processes.\n\nChange-Id: Icda77fb2a1dd349969e3ff2c8fff0f19b40b31d3\n" }, { "commit": "5d7b4368d9eece9f78c808fbda5b59700bfe6671", "tree": "6df0a0cbc9db03552fed562a034333180d62f102", "parents": [ "d28c3643a60853dfd4cdf71496a5ab4aabd6fb43", "bbe1860ae38b96d4d347990d1fb857e978828224" ], "author": { "name": "Jesse Hall", "email": "jessehall@google.com", "time": "Wed Sep 26 14:39:45 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 14:39:45 2012 -0700" }, "message": "am bbe1860a: am 62fbb831: Merge \"Document interaction of SurfaceView and post-layout transforms\" into jb-mr1-dev\n\n* commit \u0027bbe1860ae38b96d4d347990d1fb857e978828224\u0027:\n Document interaction of SurfaceView and post-layout transforms\n" }, { "commit": "bbe1860ae38b96d4d347990d1fb857e978828224", "tree": "bdc5962773cca0b2d72ff43bdbcebd40601f5f23", "parents": [ "21289957a91213c922236deb6010dbde1d652c5e", "62fbb8311a1fe84fd1b09e27169757c85d7933cb" ], "author": { "name": "Jesse Hall", "email": "jessehall@google.com", "time": "Wed Sep 26 14:37:43 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 14:37:43 2012 -0700" }, "message": "am 62fbb831: Merge \"Document interaction of SurfaceView and post-layout transforms\" into jb-mr1-dev\n\n* commit \u002762fbb8311a1fe84fd1b09e27169757c85d7933cb\u0027:\n Document interaction of SurfaceView and post-layout transforms\n" }, { "commit": "62fbb8311a1fe84fd1b09e27169757c85d7933cb", "tree": "bdc5962773cca0b2d72ff43bdbcebd40601f5f23", "parents": [ "fea9df6386d66089b004719f194625e159bb344a", "c9f345ff7bc59916d5168d49d9312b2ff7a07daa" ], "author": { "name": "Jesse Hall", "email": "jessehall@google.com", "time": "Wed Sep 26 14:34:44 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 14:34:44 2012 -0700" }, "message": "Merge \"Document interaction of SurfaceView and post-layout transforms\" into jb-mr1-dev" }, { "commit": "d28c3643a60853dfd4cdf71496a5ab4aabd6fb43", "tree": "ef586fde8ab955c8f63e9187f08fa90153a18c9c", "parents": [ "e8ac0e68d1a42c588d27efcefada4b04674cee49", "21289957a91213c922236deb6010dbde1d652c5e" ], "author": { "name": "Fabrice Di Meglio", "email": "fdimeglio@google.com", "time": "Wed Sep 26 13:58:11 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 13:58:11 2012 -0700" }, "message": "am 21289957: am fea9df63: Merge \"Fix bug #6427629 Clean up layout direction APIs\" into jb-mr1-dev\n\n* commit \u002721289957a91213c922236deb6010dbde1d652c5e\u0027:\n Fix bug #6427629 Clean up layout direction APIs\n" }, { "commit": "21289957a91213c922236deb6010dbde1d652c5e", "tree": "36f5b75db6cb20ac5aefd9d2ea595b14873e1a56", "parents": [ "b39f3f4696bf473d986ecc45461754beec931174", "fea9df6386d66089b004719f194625e159bb344a" ], "author": { "name": "Fabrice Di Meglio", "email": "fdimeglio@google.com", "time": "Wed Sep 26 13:56:23 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 13:56:23 2012 -0700" }, "message": "am fea9df63: Merge \"Fix bug #6427629 Clean up layout direction APIs\" into jb-mr1-dev\n\n* commit \u0027fea9df6386d66089b004719f194625e159bb344a\u0027:\n Fix bug #6427629 Clean up layout direction APIs\n" }, { "commit": "fea9df6386d66089b004719f194625e159bb344a", "tree": "36f5b75db6cb20ac5aefd9d2ea595b14873e1a56", "parents": [ "8b3750e2ce6a4627df751eb239b7b75d390149cc", "1f88ba8bf67bb9264e39547ab1201aa3c5395d0e" ], "author": { "name": "Fabrice Di Meglio", "email": "fdimeglio@google.com", "time": "Wed Sep 26 13:54:15 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 13:54:16 2012 -0700" }, "message": "Merge \"Fix bug #6427629 Clean up layout direction APIs\" into jb-mr1-dev" }, { "commit": "e8ac0e68d1a42c588d27efcefada4b04674cee49", "tree": "35164414b7ccf3b82c5e2b9d7853f19998890265", "parents": [ "1c8cd46a0979cb8ad4e4bf66758279446127d25e", "b39f3f4696bf473d986ecc45461754beec931174" ], "author": { "name": "Ashish Sharma", "email": "ashishsharma@google.com", "time": "Wed Sep 26 13:53:01 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 13:53:01 2012 -0700" }, "message": "am b39f3f46: am 8b3750e2: Merge \"Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global\" into jb-mr1-dev\n\n* commit \u0027b39f3f4696bf473d986ecc45461754beec931174\u0027:\n Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global\n" }, { "commit": "b39f3f4696bf473d986ecc45461754beec931174", "tree": "b4a9539d245f2f32443034d60980beee0893ae88", "parents": [ "83b6c24e612a0bf625c24502a3c0b7617a85af50", "8b3750e2ce6a4627df751eb239b7b75d390149cc" ], "author": { "name": "Ashish Sharma", "email": "ashishsharma@google.com", "time": "Wed Sep 26 13:51:09 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 13:51:09 2012 -0700" }, "message": "am 8b3750e2: Merge \"Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global\" into jb-mr1-dev\n\n* commit \u00278b3750e2ce6a4627df751eb239b7b75d390149cc\u0027:\n Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global\n" }, { "commit": "8b3750e2ce6a4627df751eb239b7b75d390149cc", "tree": "b4a9539d245f2f32443034d60980beee0893ae88", "parents": [ "54ea6bf2aa5e8d72c96f410d87ec96431abe641c", "404479a98c444e7f47783891e799978a3802a666" ], "author": { "name": "Ashish Sharma", "email": "ashishsharma@google.com", "time": "Wed Sep 26 13:49:28 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 13:49:29 2012 -0700" }, "message": "Merge \"Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global\" into jb-mr1-dev" }, { "commit": "1c8cd46a0979cb8ad4e4bf66758279446127d25e", "tree": "35164414b7ccf3b82c5e2b9d7853f19998890265", "parents": [ "2ecc9592e5754eb1845a7161f6e8fa55ff9cc55c", "83b6c24e612a0bf625c24502a3c0b7617a85af50" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Wed Sep 26 13:47:48 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 13:47:48 2012 -0700" }, "message": "am 83b6c24e: am 54ea6bf2: Merge \"Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173\" into jb-mr1-dev\n\n* commit \u002783b6c24e612a0bf625c24502a3c0b7617a85af50\u0027:\n Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173\n" }, { "commit": "83b6c24e612a0bf625c24502a3c0b7617a85af50", "tree": "b4a9539d245f2f32443034d60980beee0893ae88", "parents": [ "a98137c16d433ebc14e64c363e8c2fe86c74c2a7", "54ea6bf2aa5e8d72c96f410d87ec96431abe641c" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Wed Sep 26 13:46:01 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 13:46:01 2012 -0700" }, "message": "am 54ea6bf2: Merge \"Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173\" into jb-mr1-dev\n\n* commit \u002754ea6bf2aa5e8d72c96f410d87ec96431abe641c\u0027:\n Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173\n" }, { "commit": "404479a98c444e7f47783891e799978a3802a666", "tree": "7ae609d309ad172338fd36b6303eeacbdb0b11ec", "parents": [ "be47828fbce3c647211b6948df4b61a27275cdff" ], "author": { "name": "Ashish Sharma", "email": "ashishsharma@google.com", "time": "Wed Sep 26 11:33:50 2012 -0700" }, "committer": { "name": "Ashish Sharma", "email": "ashishsharma@google.com", "time": "Wed Sep 26 13:45:18 2012 -0700" }, "message": "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global\n\nBug: 7189605\nChange-Id: Id54b8d490d7849bf071c3fbfd8f7358ed873a4e8\n" }, { "commit": "54ea6bf2aa5e8d72c96f410d87ec96431abe641c", "tree": "b4a9539d245f2f32443034d60980beee0893ae88", "parents": [ "1951db86f527ff4e8c2ddf4306779ce956cd372d", "bd43152bda835c5a9a619a5869344a6a3af11917" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Wed Sep 26 13:44:03 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 13:44:03 2012 -0700" }, "message": "Merge \"Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173\" into jb-mr1-dev" }, { "commit": "2ecc9592e5754eb1845a7161f6e8fa55ff9cc55c", "tree": "8f6bcb730002a17032aa3d7d2a11d2d5d2d44f2c", "parents": [ "6214c9c0c2a77c8025d9b5aceb3d1f6c79b7f6a0", "a98137c16d433ebc14e64c363e8c2fe86c74c2a7" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Sep 26 13:42:39 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 13:42:39 2012 -0700" }, "message": "am a98137c1: am 1951db86: Merge \"Multi-user ringtone playback.\" into jb-mr1-dev\n\n* commit \u0027a98137c16d433ebc14e64c363e8c2fe86c74c2a7\u0027:\n Multi-user ringtone playback.\n" }, { "commit": "a98137c16d433ebc14e64c363e8c2fe86c74c2a7", "tree": "ec949cff9b00baf7d1a80909a80984bbdc933e9f", "parents": [ "aaa2ebdccec0d37a990ae45d831847f9253b8a65", "1951db86f527ff4e8c2ddf4306779ce956cd372d" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Sep 26 13:40:53 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 13:40:53 2012 -0700" }, "message": "am 1951db86: Merge \"Multi-user ringtone playback.\" into jb-mr1-dev\n\n* commit \u00271951db86f527ff4e8c2ddf4306779ce956cd372d\u0027:\n Multi-user ringtone playback.\n" }, { "commit": "1951db86f527ff4e8c2ddf4306779ce956cd372d", "tree": "ec949cff9b00baf7d1a80909a80984bbdc933e9f", "parents": [ "fd3398c8bf25d8ec7ce813ebda431d67d734f268", "65c4a2b26cd8776b0927e9b0e07ecf53bd31b627" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Sep 26 13:38:21 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 13:38:22 2012 -0700" }, "message": "Merge \"Multi-user ringtone playback.\" into jb-mr1-dev" }, { "commit": "bd43152bda835c5a9a619a5869344a6a3af11917", "tree": "ad22da56112db10f5db9a8ec7240d709306262fa", "parents": [ "e529ece37f664f8947a1d4a1e27d679f6f286388" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Wed Sep 26 13:31:25 2012 -0700" }, "committer": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Wed Sep 26 13:36:47 2012 -0700" }, "message": "Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR\nBug #7221173\n\nChange-Id: I231a47187792c93af9e3b9321fd1e25bc2f20117\n" }, { "commit": "6214c9c0c2a77c8025d9b5aceb3d1f6c79b7f6a0", "tree": "6dda1ae74941ccb5dbd87a5e392f8f4540a2510c", "parents": [ "0e2bb7b9a96a070baaa1d977a7807b531f870017", "aaa2ebdccec0d37a990ae45d831847f9253b8a65" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Wed Sep 26 12:52:29 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 12:52:29 2012 -0700" }, "message": "am aaa2ebdc: am fd3398c8: am 44c564f2: am d8104d9b: am 829986a5: Merge \"DOC CHANGE: Fix Google Play services page\" into jb-dev-docs\n\n* commit \u0027aaa2ebdccec0d37a990ae45d831847f9253b8a65\u0027:\n DOC CHANGE: Fix Google Play services page\n" }, { "commit": "aaa2ebdccec0d37a990ae45d831847f9253b8a65", "tree": "85e093526f08a5fee459fec7ce0521fbe70330b0", "parents": [ "17a5745bc99d25977013588a71a4c2a45138199c", "fd3398c8bf25d8ec7ce813ebda431d67d734f268" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Wed Sep 26 12:50:17 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 12:50:17 2012 -0700" }, "message": "am fd3398c8: am 44c564f2: am d8104d9b: am 829986a5: Merge \"DOC CHANGE: Fix Google Play services page\" into jb-dev-docs\n\n* commit \u0027fd3398c8bf25d8ec7ce813ebda431d67d734f268\u0027:\n DOC CHANGE: Fix Google Play services page\n" }, { "commit": "fd3398c8bf25d8ec7ce813ebda431d67d734f268", "tree": "85e093526f08a5fee459fec7ce0521fbe70330b0", "parents": [ "832981c2135317d26bfaf2dc40acff30135542c3", "44c564f251653286f3d2b8608ff5fccba39e831f" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Wed Sep 26 12:48:58 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 12:48:58 2012 -0700" }, "message": "am 44c564f2: am d8104d9b: am 829986a5: Merge \"DOC CHANGE: Fix Google Play services page\" into jb-dev-docs\n\n* commit \u002744c564f251653286f3d2b8608ff5fccba39e831f\u0027:\n DOC CHANGE: Fix Google Play services page\n" }, { "commit": "44c564f251653286f3d2b8608ff5fccba39e831f", "tree": "6aa18a4484fb99d0624eabcaf37dfb30812ac875", "parents": [ "6aba1d7bb9935c42ef8dd53ce81cb45184a39e45", "d8104d9b3debad8c960a302972488e5157702618" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Wed Sep 26 12:45:58 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 12:45:58 2012 -0700" }, "message": "am d8104d9b: am 829986a5: Merge \"DOC CHANGE: Fix Google Play services page\" into jb-dev-docs\n\n* commit \u0027d8104d9b3debad8c960a302972488e5157702618\u0027:\n DOC CHANGE: Fix Google Play services page\n" }, { "commit": "d8104d9b3debad8c960a302972488e5157702618", "tree": "6271bfa4594bc35e92a7ca77c17e923372a7769b", "parents": [ "8a58c030e3a56878cac6f449161c8b29d9557006", "829986a5f6b46a744f1f9953b8af5bbe849c71a9" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Wed Sep 26 12:43:38 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 12:43:38 2012 -0700" }, "message": "am 829986a5: Merge \"DOC CHANGE: Fix Google Play services page\" into jb-dev-docs\n\n* commit \u0027829986a5f6b46a744f1f9953b8af5bbe849c71a9\u0027:\n DOC CHANGE: Fix Google Play services page\n" }, { "commit": "829986a5f6b46a744f1f9953b8af5bbe849c71a9", "tree": "577bf8ccd2c0d2f36c60f63fd8e4aef33edc59fd", "parents": [ "8e3dca8d274270d8cb43d0df10787c7409bcc8cc", "74708d896b32caacb8d5977acbcde6f8e2969794" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Wed Sep 26 12:41:42 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 12:41:43 2012 -0700" }, "message": "Merge \"DOC CHANGE: Fix Google Play services page\" into jb-dev-docs" }, { "commit": "74708d896b32caacb8d5977acbcde6f8e2969794", "tree": "17386a7c0110816d74d8fc30ec31656c086d90b4", "parents": [ "3b1c5d55517260516bfa5591ca08bb39d336d511" ], "author": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Wed Sep 26 12:20:24 2012 -0700" }, "committer": { "name": "Joe Malin", "email": "jmalin@google.com", "time": "Wed Sep 26 12:36:50 2012 -0700" }, "message": "DOC CHANGE: Fix Google Play services page\n\nChange-Id: I9b175a01ee415fee187ff4257c36b9462acfd29b\n" }, { "commit": "0e2bb7b9a96a070baaa1d977a7807b531f870017", "tree": "7c4736f81853659f3cc08e36d407f60371122b03", "parents": [ "3d3eac7beef4218005389f3b34765c37c3c2a13b", "17a5745bc99d25977013588a71a4c2a45138199c" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Sep 26 12:09:43 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 12:09:43 2012 -0700" }, "message": "am 17a5745b: am 832981c2: am 6aba1d7b: am 8a58c030: am 8e3dca8d: Merge \"Doc change: Update GP services description.\" into jb-dev-docs\n\n* commit \u002717a5745bc99d25977013588a71a4c2a45138199c\u0027:\n Doc change: Update GP services description.\n" }, { "commit": "c9f345ff7bc59916d5168d49d9312b2ff7a07daa", "tree": "8a1addd6e2b196d1c8eef17c6c15cd07e32be46d", "parents": [ "3b772c6b6754aede43cbc849b89e91b399d6828d" ], "author": { "name": "Jesse Hall", "email": "jessehall@google.com", "time": "Wed Sep 26 11:55:16 2012 -0700" }, "committer": { "name": "Jesse Hall", "email": "jessehall@google.com", "time": "Wed Sep 26 12:07:12 2012 -0700" }, "message": "Document interaction of SurfaceView and post-layout transforms\n\nBug: 7179570\nChange-Id: I9c4d71242bcb832c0cb3b62ec26aba54f146d70a\n" }, { "commit": "17a5745bc99d25977013588a71a4c2a45138199c", "tree": "5904b8aed0f90ae63ae4c20d994d09f55b188324", "parents": [ "68c37742cfdff42b9df4fbd6bbe3d75a0381ce56", "832981c2135317d26bfaf2dc40acff30135542c3" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Sep 26 12:06:49 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 12:06:49 2012 -0700" }, "message": "am 832981c2: am 6aba1d7b: am 8a58c030: am 8e3dca8d: Merge \"Doc change: Update GP services description.\" into jb-dev-docs\n\n* commit \u0027832981c2135317d26bfaf2dc40acff30135542c3\u0027:\n Doc change: Update GP services description.\n" }, { "commit": "832981c2135317d26bfaf2dc40acff30135542c3", "tree": "5904b8aed0f90ae63ae4c20d994d09f55b188324", "parents": [ "b4510e3c6dc645753533cd3b2e17e99de41480b4", "6aba1d7bb9935c42ef8dd53ce81cb45184a39e45" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Sep 26 12:04:50 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 12:04:50 2012 -0700" }, "message": "am 6aba1d7b: am 8a58c030: am 8e3dca8d: Merge \"Doc change: Update GP services description.\" into jb-dev-docs\n\n* commit \u00276aba1d7bb9935c42ef8dd53ce81cb45184a39e45\u0027:\n Doc change: Update GP services description.\n" }, { "commit": "6aba1d7bb9935c42ef8dd53ce81cb45184a39e45", "tree": "10758ee0bd47d5cc789fde518e44a8a2cac04b3f", "parents": [ "3cda846725c31b49f6c60ba986ccc7b2eb1adab3", "8a58c030e3a56878cac6f449161c8b29d9557006" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Sep 26 12:02:47 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 12:02:47 2012 -0700" }, "message": "am 8a58c030: am 8e3dca8d: Merge \"Doc change: Update GP services description.\" into jb-dev-docs\n\n* commit \u00278a58c030e3a56878cac6f449161c8b29d9557006\u0027:\n Doc change: Update GP services description.\n" }, { "commit": "3d3eac7beef4218005389f3b34765c37c3c2a13b", "tree": "2d1cd74bdc4626d9193c018644f53c0ea43f6ba8", "parents": [ "47a39892a4b29c48a8491ab9fcfa03e7cfed9017", "68c37742cfdff42b9df4fbd6bbe3d75a0381ce56" ], "author": { "name": "Xia Wang", "email": "xiaw@google.com", "time": "Wed Sep 26 12:02:44 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 12:02:44 2012 -0700" }, "message": "am 68c37742: am b4510e3c: Merge \"Fix Wifi Stress test after wifi settings are moved to Settings.global\" into jb-mr1-dev\n\n* commit \u002768c37742cfdff42b9df4fbd6bbe3d75a0381ce56\u0027:\n Fix Wifi Stress test after wifi settings are moved to Settings.global\n" }, { "commit": "68c37742cfdff42b9df4fbd6bbe3d75a0381ce56", "tree": "3ebe26524e05d6a57529c457be9d69816d8edb38", "parents": [ "56d86e53b539fd892cb30e5d59078b7dc45a51a8", "b4510e3c6dc645753533cd3b2e17e99de41480b4" ], "author": { "name": "Xia Wang", "email": "xiaw@google.com", "time": "Wed Sep 26 12:00:58 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 12:00:58 2012 -0700" }, "message": "am b4510e3c: Merge \"Fix Wifi Stress test after wifi settings are moved to Settings.global\" into jb-mr1-dev\n\n* commit \u0027b4510e3c6dc645753533cd3b2e17e99de41480b4\u0027:\n Fix Wifi Stress test after wifi settings are moved to Settings.global\n" }, { "commit": "8a58c030e3a56878cac6f449161c8b29d9557006", "tree": "cc606b2d198a2c704799ec847b3bf6b69d932c57", "parents": [ "8bf95ee635b0cada3c6c2d21801bbd1e871b9fcc", "8e3dca8d274270d8cb43d0df10787c7409bcc8cc" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Sep 26 12:00:54 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 12:00:54 2012 -0700" }, "message": "am 8e3dca8d: Merge \"Doc change: Update GP services description.\" into jb-dev-docs\n\n* commit \u00278e3dca8d274270d8cb43d0df10787c7409bcc8cc\u0027:\n Doc change: Update GP services description.\n" }, { "commit": "b4510e3c6dc645753533cd3b2e17e99de41480b4", "tree": "3ebe26524e05d6a57529c457be9d69816d8edb38", "parents": [ "4368ba45adebf17d7962ad551363ac302cb2b1c7", "3272a38dbc5fdf2d68b653592a244059cd29255a" ], "author": { "name": "Xia Wang", "email": "xiaw@google.com", "time": "Wed Sep 26 11:58:58 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 11:58:59 2012 -0700" }, "message": "Merge \"Fix Wifi Stress test after wifi settings are moved to Settings.global\" into jb-mr1-dev" }, { "commit": "8e3dca8d274270d8cb43d0df10787c7409bcc8cc", "tree": "0d517c77625dfa5e4484c86f626516a6d9e37e8c", "parents": [ "ed5ff3bdb015b0dc391a566d6f61ba7a533b3843", "d2a8a5ecf90720195d83b78a36cefd61c6d85f74" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Sep 26 11:58:29 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 11:58:30 2012 -0700" }, "message": "Merge \"Doc change: Update GP services description.\" into jb-dev-docs" }, { "commit": "47a39892a4b29c48a8491ab9fcfa03e7cfed9017", "tree": "4661145491b2454f5929dd262a6a5cc5f355e0e6", "parents": [ "2ac6b296a72965583d5f7aba3edcdc38f2c71cce", "56d86e53b539fd892cb30e5d59078b7dc45a51a8" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Sep 26 11:54:29 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:54:29 2012 -0700" }, "message": "am 56d86e53: am 4368ba45: am 3cda8467: am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs\n\n* commit \u002756d86e53b539fd892cb30e5d59078b7dc45a51a8\u0027:\n add analog clock attributes to docs\n" }, { "commit": "d2a8a5ecf90720195d83b78a36cefd61c6d85f74", "tree": "35fc59469d3c6ddf65101c550152bbfb70794891", "parents": [ "b79d8ecc27c0c7a8c2f8dcc1a752450e4d7d39e2" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Sep 26 11:54:18 2012 -0700" }, "committer": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed Sep 26 11:54:18 2012 -0700" }, "message": "Doc change: Update GP services description.\n\nChange-Id: I9891c3bd900726d0c7fb39ac91157e6e58c52ed8\n" }, { "commit": "56d86e53b539fd892cb30e5d59078b7dc45a51a8", "tree": "ff25afac1ab74b092a6df9133fd0166250d55c35", "parents": [ "7d4f070e18eadae0c056f6929dbf524a1aea1b84", "4368ba45adebf17d7962ad551363ac302cb2b1c7" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Sep 26 11:51:43 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:51:43 2012 -0700" }, "message": "am 4368ba45: am 3cda8467: am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs\n\n* commit \u00274368ba45adebf17d7962ad551363ac302cb2b1c7\u0027:\n add analog clock attributes to docs\n" }, { "commit": "2ac6b296a72965583d5f7aba3edcdc38f2c71cce", "tree": "0bb88fc8047a86202874dab25dbe38c02cfc9135", "parents": [ "72ce2c17634339d2c3dc5d97cd59b2d76eed4c50", "7d4f070e18eadae0c056f6929dbf524a1aea1b84" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Sep 26 11:50:18 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:50:18 2012 -0700" }, "message": "am 7d4f070e: (-s ours) am a2b978bc: Merge \"Fix writing text version of styleable IDs. do not merge.\" into jb-mr1-dev\n\n* commit \u00277d4f070e18eadae0c056f6929dbf524a1aea1b84\u0027:\n Fix writing text version of styleable IDs. do not merge.\n" }, { "commit": "4368ba45adebf17d7962ad551363ac302cb2b1c7", "tree": "ff25afac1ab74b092a6df9133fd0166250d55c35", "parents": [ "a2b978bc55d5ebd8c32c41a707b5a155216ee0a5", "3cda846725c31b49f6c60ba986ccc7b2eb1adab3" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Sep 26 11:49:48 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:49:48 2012 -0700" }, "message": "am 3cda8467: am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs\n\n* commit \u00273cda846725c31b49f6c60ba986ccc7b2eb1adab3\u0027:\n add analog clock attributes to docs\n" }, { "commit": "3cda846725c31b49f6c60ba986ccc7b2eb1adab3", "tree": "72f8cd0291af2beeac8f3132fe58887bb9f87ea1", "parents": [ "16eb53668bc000c9d6cdd9c2dd68e51f16483d25", "8bf95ee635b0cada3c6c2d21801bbd1e871b9fcc" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Sep 26 11:47:38 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:47:38 2012 -0700" }, "message": "am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs\n\n* commit \u00278bf95ee635b0cada3c6c2d21801bbd1e871b9fcc\u0027:\n add analog clock attributes to docs\n" }, { "commit": "7d4f070e18eadae0c056f6929dbf524a1aea1b84", "tree": "ec511707311426d25e43fd87dd7ad297b10b26b0", "parents": [ "991a5f3856b3f714d81141e7413558e5fbe8109a", "a2b978bc55d5ebd8c32c41a707b5a155216ee0a5" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Sep 26 11:47:24 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:47:24 2012 -0700" }, "message": "am a2b978bc: Merge \"Fix writing text version of styleable IDs. do not merge.\" into jb-mr1-dev\n\n* commit \u0027a2b978bc55d5ebd8c32c41a707b5a155216ee0a5\u0027:\n Fix writing text version of styleable IDs. do not merge.\n" }, { "commit": "8bf95ee635b0cada3c6c2d21801bbd1e871b9fcc", "tree": "81fb43152e725d520a60af081de3eeee8b6dfe66", "parents": [ "5464524524ce40af3e421e2d1c9bf810605ae43a", "ed5ff3bdb015b0dc391a566d6f61ba7a533b3843" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Sep 26 11:45:21 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:45:21 2012 -0700" }, "message": "am ed5ff3bd: add analog clock attributes to docs\n\n* commit \u0027ed5ff3bdb015b0dc391a566d6f61ba7a533b3843\u0027:\n add analog clock attributes to docs\n" }, { "commit": "a2b978bc55d5ebd8c32c41a707b5a155216ee0a5", "tree": "ec511707311426d25e43fd87dd7ad297b10b26b0", "parents": [ "80c491f07ac9f6453309fcaa601e904ae80a172e", "0122a3db313d3a7b55e0dee5eae1d7798c0d55be" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Sep 26 11:45:08 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 11:45:09 2012 -0700" }, "message": "Merge \"Fix writing text version of styleable IDs. do not merge.\" into jb-mr1-dev" }, { "commit": "72ce2c17634339d2c3dc5d97cd59b2d76eed4c50", "tree": "0bb88fc8047a86202874dab25dbe38c02cfc9135", "parents": [ "8a9a095295d26f7fb250eaba272cee888a49e5f3", "991a5f3856b3f714d81141e7413558e5fbe8109a" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Sep 26 11:44:50 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:44:50 2012 -0700" }, "message": "am 991a5f38: am 80c491f0: am 16eb5366: am 54645245: am 14a36625: fix markup bugs\n\n* commit \u0027991a5f3856b3f714d81141e7413558e5fbe8109a\u0027:\n fix markup bugs\n" }, { "commit": "ed5ff3bdb015b0dc391a566d6f61ba7a533b3843", "tree": "1251eb61a0809a3a0f035676de8331318862148b", "parents": [ "14a366255aee79eec81d5a80ec3d8f298af9a938" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Sep 26 11:42:09 2012 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Sep 26 11:42:09 2012 -0700" }, "message": "add analog clock attributes to docs\n\nChange-Id: I70e8a7897f9e076664ea5069ee9e19e458e8b36b\n" }, { "commit": "991a5f3856b3f714d81141e7413558e5fbe8109a", "tree": "ec511707311426d25e43fd87dd7ad297b10b26b0", "parents": [ "81f9c799241cea72214d1cdd0f139ef9ae80db66", "80c491f07ac9f6453309fcaa601e904ae80a172e" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Sep 26 11:41:43 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:41:43 2012 -0700" }, "message": "am 80c491f0: am 16eb5366: am 54645245: am 14a36625: fix markup bugs\n\n* commit \u002780c491f07ac9f6453309fcaa601e904ae80a172e\u0027:\n fix markup bugs\n" }, { "commit": "80c491f07ac9f6453309fcaa601e904ae80a172e", "tree": "9af53503de6259a2d838cb66465d8c11f5f872c2", "parents": [ "2ea1045a0148cac45f873fc6324682044d599f73", "16eb53668bc000c9d6cdd9c2dd68e51f16483d25" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Sep 26 11:39:54 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:39:54 2012 -0700" }, "message": "am 16eb5366: am 54645245: am 14a36625: fix markup bugs\n\n* commit \u002716eb53668bc000c9d6cdd9c2dd68e51f16483d25\u0027:\n fix markup bugs\n" }, { "commit": "16eb53668bc000c9d6cdd9c2dd68e51f16483d25", "tree": "e61a01bd5594e42b37ebe3a12041b95c7d7396f4", "parents": [ "4649d03b96f576c4a7d5d4aa7d7d637a6ae091aa", "5464524524ce40af3e421e2d1c9bf810605ae43a" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Sep 26 11:37:38 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:37:38 2012 -0700" }, "message": "am 54645245: am 14a36625: fix markup bugs\n\n* commit \u00275464524524ce40af3e421e2d1c9bf810605ae43a\u0027:\n fix markup bugs\n" }, { "commit": "5464524524ce40af3e421e2d1c9bf810605ae43a", "tree": "05bc5f4ba6a33d282f463c21ba7dafa2dc6856ca", "parents": [ "6c6ddbff890afb2133f6da79237cf581f00c13ba", "14a366255aee79eec81d5a80ec3d8f298af9a938" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Sep 26 11:34:49 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:34:49 2012 -0700" }, "message": "am 14a36625: fix markup bugs\n\n* commit \u002714a366255aee79eec81d5a80ec3d8f298af9a938\u0027:\n fix markup bugs\n" }, { "commit": "8a9a095295d26f7fb250eaba272cee888a49e5f3", "tree": "5fae2d4bf32f7df6b7e46c5057d6d04ee4e04d51", "parents": [ "46193469c7b02e5fc0a949419acf0c4d83401a70", "81f9c799241cea72214d1cdd0f139ef9ae80db66" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Wed Sep 26 11:29:17 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:29:17 2012 -0700" }, "message": "am 81f9c799: am 2ea1045a: Merge \"Applies a layer\\\u0027s color filter even when the layer is a quad Bug #7238059\" into jb-mr1-dev\n\n* commit \u002781f9c799241cea72214d1cdd0f139ef9ae80db66\u0027:\n Applies a layer\u0027s color filter even when the layer is a quad Bug #7238059\n" }, { "commit": "81f9c799241cea72214d1cdd0f139ef9ae80db66", "tree": "b26a9fd082c263639e39a3848d9dc781c10f0136", "parents": [ "ccb06b415747655cead26a801560b68ee061b870", "2ea1045a0148cac45f873fc6324682044d599f73" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Wed Sep 26 11:27:09 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:27:09 2012 -0700" }, "message": "am 2ea1045a: Merge \"Applies a layer\\\u0027s color filter even when the layer is a quad Bug #7238059\" into jb-mr1-dev\n\n* commit \u00272ea1045a0148cac45f873fc6324682044d599f73\u0027:\n Applies a layer\u0027s color filter even when the layer is a quad Bug #7238059\n" }, { "commit": "2ea1045a0148cac45f873fc6324682044d599f73", "tree": "3c2aed78d6602a2f6a6217cce85bbd45c72a4d2f", "parents": [ "fddedc94b77812ea13afe8cae32ad27d7266f787", "e529ece37f664f8947a1d4a1e27d679f6f286388" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Wed Sep 26 11:25:04 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 11:25:04 2012 -0700" }, "message": "Merge \"Applies a layer\u0027s color filter even when the layer is a quad Bug #7238059\" into jb-mr1-dev" }, { "commit": "e529ece37f664f8947a1d4a1e27d679f6f286388", "tree": "e085f6513391293f8d0b1c08d9241adc3e48c1e0", "parents": [ "72a374705d32cf715443aa203f75c159e1bc9bd5" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Wed Sep 26 11:23:17 2012 -0700" }, "committer": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Wed Sep 26 11:23:17 2012 -0700" }, "message": "Applies a layer\u0027s color filter even when the layer is a quad\nBug #7238059\n\nChange-Id: Ib4736a419bc1a9a67a01d090516ed049fe3aebca\n" }, { "commit": "14a366255aee79eec81d5a80ec3d8f298af9a938", "tree": "f1764f458ec6e4dbb7941b21a3444537f28568f4", "parents": [ "3b1c5d55517260516bfa5591ca08bb39d336d511" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Sep 26 11:22:09 2012 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Sep 26 11:22:09 2012 -0700" }, "message": "fix markup bugs\n\nChange-Id: I37111431505f7803c2374917b3c186529c6e3d60\n" }, { "commit": "46193469c7b02e5fc0a949419acf0c4d83401a70", "tree": "a3da397879325a5ae818663a86968ecdeff65ef1", "parents": [ "4a3ababe252211e71e08cdd4542a18d53b8c47a3", "ccb06b415747655cead26a801560b68ee061b870" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Wed Sep 26 11:20:17 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:20:17 2012 -0700" }, "message": "am ccb06b41: am fddedc94: Merge \"Dream metadata now specified using an xml-resource.\" into jb-mr1-dev\n\n* commit \u0027ccb06b415747655cead26a801560b68ee061b870\u0027:\n Dream metadata now specified using an xml-resource.\n" }, { "commit": "ccb06b415747655cead26a801560b68ee061b870", "tree": "d0f61a52829e8da5628de7ba752d7d0316a44957", "parents": [ "5b523612138ead35f59ed3b3e265ba9c7351977e", "fddedc94b77812ea13afe8cae32ad27d7266f787" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Wed Sep 26 11:18:13 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:18:13 2012 -0700" }, "message": "am fddedc94: Merge \"Dream metadata now specified using an xml-resource.\" into jb-mr1-dev\n\n* commit \u0027fddedc94b77812ea13afe8cae32ad27d7266f787\u0027:\n Dream metadata now specified using an xml-resource.\n" }, { "commit": "fddedc94b77812ea13afe8cae32ad27d7266f787", "tree": "ea6eb56834a94c6ab3cc26fe92ea30ea732f6683", "parents": [ "d48478e4c6d743cd664251371fdfe4ce36c852ec", "f41f505fac0ba31159d3cdba3ca9e0c00bc3fe9b" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Wed Sep 26 11:15:59 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 11:16:00 2012 -0700" }, "message": "Merge \"Dream metadata now specified using an xml-resource.\" into jb-mr1-dev" }, { "commit": "0122a3db313d3a7b55e0dee5eae1d7798c0d55be", "tree": "a09e249293ad45d890ad6c01b3481d2ddcf4ae00", "parents": [ "2832136bb6fcace61ef078051e94aa0a841aac15" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Sep 26 10:11:54 2012 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Sep 26 11:14:50 2012 -0700" }, "message": "Fix writing text version of styleable IDs. do not merge.\n\n(cherry picked from commit d16047434bca24b2811de7ea9d22de6ee0f87f79)\n\nChange-Id: Ic679080d5157daf77c35516c8f682bd13e2b4d96\n" }, { "commit": "4a3ababe252211e71e08cdd4542a18d53b8c47a3", "tree": "a477b7ce35cb9c3454b1cf58a7640a698b40e5c5", "parents": [ "4958553a12d0f5b07212055f57535de8e0d58ef6", "5b523612138ead35f59ed3b3e265ba9c7351977e" ], "author": { "name": "Chet Haase", "email": "chet@google.com", "time": "Wed Sep 26 11:09:49 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:09:49 2012 -0700" }, "message": "am 5b523612: am d48478e4: Merge \"Assign default texture id of 0\" into jb-mr1-dev\n\n* commit \u00275b523612138ead35f59ed3b3e265ba9c7351977e\u0027:\n Assign default texture id of 0\n" }, { "commit": "4958553a12d0f5b07212055f57535de8e0d58ef6", "tree": "b04afd8b1d42bc17cf6721eea9304b6c62a825d1", "parents": [ "3345f78953af69e975484701cd9bbc87efd789c3", "3db73be5e9a65d4751dd1aae3ea215275dc31e43" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Sep 26 11:09:45 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:09:45 2012 -0700" }, "message": "am 3db73be5: (-s ours) am f8b18ced: am 4649d03b: (-s ours) am 6c6ddbff: Fix writing text version of styleable IDs. do not merge.\n\n* commit \u00273db73be5e9a65d4751dd1aae3ea215275dc31e43\u0027:\n Fix writing text version of styleable IDs. do not merge.\n" }, { "commit": "5b523612138ead35f59ed3b3e265ba9c7351977e", "tree": "98944a3506484c44886424ed614e2eebb7049c24", "parents": [ "3db73be5e9a65d4751dd1aae3ea215275dc31e43", "d48478e4c6d743cd664251371fdfe4ce36c852ec" ], "author": { "name": "Chet Haase", "email": "chet@google.com", "time": "Wed Sep 26 11:08:11 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:08:11 2012 -0700" }, "message": "am d48478e4: Merge \"Assign default texture id of 0\" into jb-mr1-dev\n\n* commit \u0027d48478e4c6d743cd664251371fdfe4ce36c852ec\u0027:\n Assign default texture id of 0\n" }, { "commit": "3db73be5e9a65d4751dd1aae3ea215275dc31e43", "tree": "a09e249293ad45d890ad6c01b3481d2ddcf4ae00", "parents": [ "05113163a9e18d863932e8913be2f203c6ab1226", "f8b18ced269ddac89da92c66f594084032026ab2" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Sep 26 11:08:08 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:08:08 2012 -0700" }, "message": "am f8b18ced: am 4649d03b: (-s ours) am 6c6ddbff: Fix writing text version of styleable IDs. do not merge.\n\n* commit \u0027f8b18ced269ddac89da92c66f594084032026ab2\u0027:\n Fix writing text version of styleable IDs. do not merge.\n" }, { "commit": "d48478e4c6d743cd664251371fdfe4ce36c852ec", "tree": "aab3eee1431726aeee7dc37176a8d981e7e080e0", "parents": [ "f8b18ced269ddac89da92c66f594084032026ab2", "98d3a64ffa13596e3ea9125bbff40c51ec96bd8d" ], "author": { "name": "Chet Haase", "email": "chet@google.com", "time": "Wed Sep 26 11:06:37 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 11:06:38 2012 -0700" }, "message": "Merge \"Assign default texture id of 0\" into jb-mr1-dev" }, { "commit": "f8b18ced269ddac89da92c66f594084032026ab2", "tree": "0315560055c6aebf1740a3955a847815a9eca484", "parents": [ "2832136bb6fcace61ef078051e94aa0a841aac15", "4649d03b96f576c4a7d5d4aa7d7d637a6ae091aa" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Sep 26 11:06:03 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:06:03 2012 -0700" }, "message": "am 4649d03b: (-s ours) am 6c6ddbff: Fix writing text version of styleable IDs. do not merge.\n\n* commit \u00274649d03b96f576c4a7d5d4aa7d7d637a6ae091aa\u0027:\n Fix writing text version of styleable IDs. do not merge.\n" }, { "commit": "4649d03b96f576c4a7d5d4aa7d7d637a6ae091aa", "tree": "31c9a5b67a53afd387ac7eee999fb323ba09a0d8", "parents": [ "82e7fdfd47e7de5408c3a0e296475bb1e945f339", "6c6ddbff890afb2133f6da79237cf581f00c13ba" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Sep 26 11:03:45 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:03:45 2012 -0700" }, "message": "am 6c6ddbff: Fix writing text version of styleable IDs. do not merge.\n\n* commit \u00276c6ddbff890afb2133f6da79237cf581f00c13ba\u0027:\n Fix writing text version of styleable IDs. do not merge.\n" }, { "commit": "98d3a64ffa13596e3ea9125bbff40c51ec96bd8d", "tree": "306cfeea0b0834f3b832a4dba12f6395ea9da097", "parents": [ "4e1ab15b305aac26ad8819fc3b2951e20985944d" ], "author": { "name": "Chet Haase", "email": "chet@google.com", "time": "Wed Sep 26 10:27:40 2012 -0700" }, "committer": { "name": "Chet Haase", "email": "chet@google.com", "time": "Wed Sep 26 11:01:42 2012 -0700" }, "message": "Assign default texture id of 0\n\nSome logic depends on a default value of 0, which was not being\nassigned.\n\nIssue #7195815 chrome url bar is corrupted\nIssue #7190656 Textures corrupted on mr1\n\nChange-Id: I346b7b76e885bf8f04740e711fd88f917a5418c7\n" }, { "commit": "6c6ddbff890afb2133f6da79237cf581f00c13ba", "tree": "c9c61752b1a814b94f7e4901900e3016b9716945", "parents": [ "4f832bc796bad90e5632c3ab69e305b3c7c008ba" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Sep 26 10:11:54 2012 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Sep 26 11:00:41 2012 -0700" }, "message": "Fix writing text version of styleable IDs. do not merge.\n\n(cherry picked from commit d16047434bca24b2811de7ea9d22de6ee0f87f79)\n\nChange-Id: Ia1fc343e0649b175d290357f63eebec0dd1ae14a\n" }, { "commit": "65c4a2b26cd8776b0927e9b0e07ecf53bd31b627", "tree": "7dbd0b29b66336c738a0c599335ad70bb86ba4a2", "parents": [ "5e21bf934b2a71b595deb9856a2044eea4dbce86" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Sep 25 17:22:27 2012 -0700" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Sep 26 10:49:35 2012 -0700" }, "message": "Multi-user ringtone playback.\n\nChange RingtonePlayer to open content:// Uris based on requesting\nUserHandle. Grant SystemUI visibility to all emulated storage so\nit can play ringtones for apps without READ_EXTERNAL_STORAGE.\n\nResolve canonical file:// Uris before passing out of source app,\nreplacing any /emulated_legacy/-style paths with user-specific\nvariant so they can be opened by SystemUI. Calling for RemoteViews,\nRingtones, and Notifications.\n\nBug: 7202982\nChange-Id: Ibf0eca8df80c1486711144a7b648f464aadfe099\n" } ], "next": "3345f78953af69e975484701cd9bbc87efd789c3" }