)]}' { "log": [ { "commit": "8f9d92c4ca5233607ca01dac0b3b66fde5539307", "tree": "05dea0b0ae6e270a743645a5cef796290657c850", "parents": [ "057dca97d9a486b94c82673a95a7a3933bca9a4d", "7406e4b8102ffd71affd55a9f453c0ecce13a097" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Apr 24 01:36:22 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 24 01:36:22 2014 +0000" }, "message": "am 7406e4b8: am 7947ec71: am b64732d9: Merge \"Fix style warnings in RenderSessionImpl [DO NOT MERGE]\" into klp-dev\n\n* commit \u00277406e4b8102ffd71affd55a9f453c0ecce13a097\u0027:\n Fix style warnings in RenderSessionImpl [DO NOT MERGE]\n" }, { "commit": "057dca97d9a486b94c82673a95a7a3933bca9a4d", "tree": "08e60e341bef65e442d2f073db4cc3bf95e798eb", "parents": [ "5dee1a093abc4d6fd197ba2c3be012c9536ba1c5", "1668ae8d2a29b491c3ae421c5b0eca101fb10824" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Apr 24 01:36:18 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 24 01:36:18 2014 +0000" }, "message": "am 1668ae8d: am a019e772: am 6aaea1bd: Merge \"Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\" into klp-dev\n\n* commit \u00271668ae8d2a29b491c3ae421c5b0eca101fb10824\u0027:\n Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n" }, { "commit": "5dee1a093abc4d6fd197ba2c3be012c9536ba1c5", "tree": "92b8f7dc633b89d7bab6c90e7ed0eddeee60877d", "parents": [ "d720ef541d06be87de3b3e03c1e7fb349299a21f", "e17ed922001cf70c48969eb7b10ee2e2557b41f9" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Apr 24 01:36:14 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 24 01:36:14 2014 +0000" }, "message": "am e17ed922: am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]\n\n* commit \u0027e17ed922001cf70c48969eb7b10ee2e2557b41f9\u0027:\n Add view cookies for action bar menus. [DO NOT MERGE]\n" }, { "commit": "7406e4b8102ffd71affd55a9f453c0ecce13a097", "tree": "c6d64ba826ce6a8cf264f7f96f70e9d6fd7aa2ca", "parents": [ "1668ae8d2a29b491c3ae421c5b0eca101fb10824", "7947ec715d8b4a0c82135553abb4947b61bf802b" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Apr 24 01:31:24 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 24 01:31:24 2014 +0000" }, "message": "am 7947ec71: am b64732d9: Merge \"Fix style warnings in RenderSessionImpl [DO NOT MERGE]\" into klp-dev\n\n* commit \u00277947ec715d8b4a0c82135553abb4947b61bf802b\u0027:\n Fix style warnings in RenderSessionImpl [DO NOT MERGE]\n" }, { "commit": "1668ae8d2a29b491c3ae421c5b0eca101fb10824", "tree": "6d1eeed53df44814762ba2fc5c30650a39091e0e", "parents": [ "e17ed922001cf70c48969eb7b10ee2e2557b41f9", "a019e77252f86962b9803042c01b897f7f1aa89f" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Apr 24 01:31:20 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 24 01:31:20 2014 +0000" }, "message": "am a019e772: am 6aaea1bd: Merge \"Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\" into klp-dev\n\n* commit \u0027a019e77252f86962b9803042c01b897f7f1aa89f\u0027:\n Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n" }, { "commit": "e17ed922001cf70c48969eb7b10ee2e2557b41f9", "tree": "1f36073f08cadc1f296d8e06facda3fa1b70df1a", "parents": [ "32117212fc48872b557044ff25ba6b8d9ace5738", "126f4057a06756fbb1c194b5d9d40f9f922d14ee" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Apr 24 01:31:15 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 24 01:31:15 2014 +0000" }, "message": "am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE]\n\n* commit \u0027126f4057a06756fbb1c194b5d9d40f9f922d14ee\u0027:\n Add view cookies for action bar menus. [DO NOT MERGE]\n" }, { "commit": "b64732d977c023423cd01d32361a49401d9203cd", "tree": "666b551016a04a75e0264701c7e6d6a03900dd29", "parents": [ "6aaea1bd4aa056335776098cd9dc523e898716f1", "1ea1b21acd5517d5405bd3338ba24d5a03a8d792" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Apr 24 01:21:54 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Apr 24 01:21:55 2014 +0000" }, "message": "Merge \"Fix style warnings in RenderSessionImpl [DO NOT MERGE]\" into klp-dev" }, { "commit": "6aaea1bd4aa056335776098cd9dc523e898716f1", "tree": "e107a8cb4f6327bc3bb351f1f59d0f0688dd6cf5", "parents": [ "5ba2f230faa355eb9bc1e90f6c48eeeb437f390c", "6f9baea47757fef4745de434e09bd552fddc1f03" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Apr 24 01:21:45 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Apr 24 01:21:46 2014 +0000" }, "message": "Merge \"Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\" into klp-dev" }, { "commit": "1ea1b21acd5517d5405bd3338ba24d5a03a8d792", "tree": "f6c8f87eb0ff022035be7916c9f1c65faabf9001", "parents": [ "5ba2f230faa355eb9bc1e90f6c48eeeb437f390c" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Apr 22 17:22:32 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Apr 23 18:04:26 2014 -0700" }, "message": "Fix style warnings in RenderSessionImpl [DO NOT MERGE]\n\nChange-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c\n(cherry-picked from commit fbfeb1a90b6f8f3966c60a69d50ce8f608d9d861)\n" }, { "commit": "5ba2f230faa355eb9bc1e90f6c48eeeb437f390c", "tree": "4cf085065cf277cd74566ca32e39c2be50761cc5", "parents": [ "c436772120ceea1d6e3f5b388ef068c99c8bb7d6" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Fri Apr 18 12:32:38 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Apr 23 18:04:21 2014 -0700" }, "message": "Add view cookies for action bar menus. [DO NOT MERGE]\n\nThe change adds the view cookies for the menus rendered in the action\nbar. This enables the IDE to map the menu to the relevant XML Tag in the\nmenu xml and show the highlighting accordingly.\n\nThe change also contains a bugfix where a method wasn\u0027t renamed\nproperly.\n\nChange-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca\n(cherry-picked from commit 1001961f904bac5294aaf73a47c2497aa764bf7f)\n" }, { "commit": "6f9baea47757fef4745de434e09bd552fddc1f03", "tree": "f6edd2591455a96ea2bc7fb4b3eef43332ece817", "parents": [ "c436772120ceea1d6e3f5b388ef068c99c8bb7d6" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Mar 31 18:59:45 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Apr 23 16:11:57 2014 -0700" }, "message": "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n\nThe bug caused some classes to be missed when computing the dependencies\nof the existing classes.\n\nChange-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa\n(cherry-picked from 4a0f93bd32b8dd9b3c351680ad82e461d5111f38)\n" }, { "commit": "be06a4182b9ff44a276f56d04b907672ee9e149a", "tree": "20805ee34627104c81516262478bff4cea514c01", "parents": [ "2c423b22b42269c0652dff4155707cec823fbfc1", "cf5c3fc70d4dcd5dc3c6054d0f7415ded0070e4f" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Apr 22 23:15:05 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Apr 22 23:15:05 2014 +0000" }, "message": "am cf5c3fc7: am 53b7df19: Merge \"Add missing ICU_Delegate methods.\"\n\n* commit \u0027cf5c3fc70d4dcd5dc3c6054d0f7415ded0070e4f\u0027:\n Add missing ICU_Delegate methods.\n" }, { "commit": "e2b67777ad8c46e4b7fd85e9cd54f82b8dbe57ea", "tree": "9d8437233347c8281bc02c4b955fcf6262e9af59", "parents": [ "fc3c6a0ef36cc4969aa7d8e160cc55f30c653325" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Apr 21 14:33:33 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Apr 21 14:33:33 2014 -0700" }, "message": "Add missing ICU_Delegate methods.\n\nUpdate the ICU_Delegate to add methods originally added in\nI5de58be7e8a701f2c40182ea54bceff85ec1aad2\n\nChange-Id: I536834fe76cbc7dae05580182fee1bea956e3e77\n" }, { "commit": "36e64ab902a6932f2711d1dff6ee273610d68e7d", "tree": "676e4144ff27016790036e5246764fc560477c71", "parents": [ "56ca82191231f3aba1132e3db06e7e09a10ec6dc", "cf4d85e4786beb98743eac68b71d67e36f76c058" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Apr 18 23:26:16 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Apr 18 23:26:16 2014 +0000" }, "message": "am cf4d85e4: am 90840ec2: Merge \"Fix warning introduced by recent psuedolocalizer change.\"\n\n* commit \u0027cf4d85e4786beb98743eac68b71d67e36f76c058\u0027:\n Fix warning introduced by recent psuedolocalizer change.\n" }, { "commit": "0a1eed394fa287523b105aa569ed6348f4986483", "tree": "8daa2e43b563a113b2eb12f32e9837d6958c0bb7", "parents": [ "92b2d5a608f9fefc9a88eea03cd599a26c1b62ce" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Apr 18 16:15:27 2014 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Apr 18 16:15:27 2014 -0700" }, "message": "Fix warning introduced by recent psuedolocalizer change.\n\nChange-Id: I577caf6ca4261b3d044b18bc8c5915012168031d\n" }, { "commit": "56ca82191231f3aba1132e3db06e7e09a10ec6dc", "tree": "bc1fb58074d536961b71686fec951fb28595fdd6", "parents": [ "235fd3c9effc63643db356a593e7f77f220a5f4c", "ec42199a71c8309a431c22ee152806736c862c4b" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Apr 18 15:56:46 2014 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Apr 18 15:56:46 2014 -0700" }, "message": "resolved conflicts for merge of ec42199a to klp-modular-dev-plus-aosp\n\nChange-Id: I9ecd5d51be4d073ab93dbb0bd60097735e76bf94\n" }, { "commit": "59dfbb91ca9c7ef979a9f10e3875f881ed1ef0a5", "tree": "b61fa2b6b82059db5d268a751ce5f07247746dcf", "parents": [ "b04f3f749b565ca075066bbc1fe89153941eaa65" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Apr 17 00:14:28 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Apr 17 00:14:28 2014 -0700" }, "message": "Fix build [DO NOT MERGE]\n\nThe branch is missing some CLs for 64-bit support. So, until they are\nadded, this change will fix the build.\n\nChange-Id: Ia838caf60ca49b406101a3fb48a96afdcfb30c66\n" }, { "commit": "492090a55e2fa94745aaf4e0e295845d8bb1351a", "tree": "fd2af7a97a0bb5a16e2a91d4b8c558f13b2e089a", "parents": [ "35d46778f49c962c990cfc17e521aa80b9e0c016", "16191f8c4fe92036c8ff2eecd4e57b4642068b99" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Apr 16 19:20:01 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 16 19:20:01 2014 +0000" }, "message": "am 16191f8c: resolved conflicts for merge of 0e2049cd to klp-modular-dev\n\n* commit \u002716191f8c4fe92036c8ff2eecd4e57b4642068b99\u0027:\n Layoutlib tests now check methods return value [DO NOT MERGE]\n" }, { "commit": "35d46778f49c962c990cfc17e521aa80b9e0c016", "tree": "41c3a387058ad08b241a92d83a348276c11c5f78", "parents": [ "82d5f137ed03dcd1020fb554a1d0f3029a826282", "ec6676ddf682e22dfb56aa54359c9480dfa661d3" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Apr 16 12:14:34 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Apr 16 12:14:34 2014 -0700" }, "message": "resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp\n\nChange-Id: I2fec735ba65f56da7d17022074f8924a259b4bbf\n" }, { "commit": "16191f8c4fe92036c8ff2eecd4e57b4642068b99", "tree": "fe4de8b0a042ada83940954a78b1c0118183e4fb", "parents": [ "ec6676ddf682e22dfb56aa54359c9480dfa661d3", "0e2049cd3905aac54496d14355117f8325e37357" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Apr 16 11:58:32 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Apr 16 11:58:32 2014 -0700" }, "message": "resolved conflicts for merge of 0e2049cd to klp-modular-dev\n\nChange-Id: I518e18d0c769a4cb5d325fc22165a8ead36e11de\n" }, { "commit": "82d5f137ed03dcd1020fb554a1d0f3029a826282", "tree": "06cf50baf62463e32d5967a978bc26970b02aeeb", "parents": [ "f2d085e867dd59aa2aaff74f6e5b265b1bffbaba", "e5d0fce7aeb60c44849cd09815ccecda702422ef" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Apr 16 18:43:23 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 16 18:43:23 2014 +0000" }, "message": "am e5d0fce7: am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]\n\n* commit \u0027e5d0fce7aeb60c44849cd09815ccecda702422ef\u0027:\n Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]\n" }, { "commit": "ec6676ddf682e22dfb56aa54359c9480dfa661d3", "tree": "37cb0d2a0fea7d4f34ef01f843dd42cfb8777b8d", "parents": [ "e5d0fce7aeb60c44849cd09815ccecda702422ef", "863848808d005fe1d2fd84a2982adfc02a3fbb9f" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Apr 16 18:40:55 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 16 18:40:55 2014 +0000" }, "message": "am 86384880: am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n\n* commit \u0027863848808d005fe1d2fd84a2982adfc02a3fbb9f\u0027:\n Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n" }, { "commit": "e5d0fce7aeb60c44849cd09815ccecda702422ef", "tree": "bbb2dfc87854271eb180190510ff26cf41493619", "parents": [ "d023360aa03db1a7831a5697d49faa2575e4a9c3", "685b7d4165c417ce20b1f6c49190eabcfda09940" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Apr 16 18:40:51 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 16 18:40:51 2014 +0000" }, "message": "am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]\n\n* commit \u0027685b7d4165c417ce20b1f6c49190eabcfda09940\u0027:\n Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]\n" }, { "commit": "f2d085e867dd59aa2aaff74f6e5b265b1bffbaba", "tree": "20cf0075dc3ed310e8cb9502e43fb0f3aac42cf3", "parents": [ "110a05c6bd2778b37c83ea5b4d9b753be0ac32ba", "d023360aa03db1a7831a5697d49faa2575e4a9c3" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Apr 16 18:39:25 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 16 18:39:25 2014 +0000" }, "message": "am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]\n\n* commit \u0027d023360aa03db1a7831a5697d49faa2575e4a9c3\u0027:\n Action bar rendering in layoutlib [DO NOT MERGE]\n" }, { "commit": "110a05c6bd2778b37c83ea5b4d9b753be0ac32ba", "tree": "651439e53c526d70ffb3de3995182dcdc2d4a01d", "parents": [ "e65c292a5e7f4d70a43f965909647f89bb46809d", "2aee07124cad720587a8c51de5650b6b93ae9150" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Apr 16 18:39:21 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 16 18:39:21 2014 +0000" }, "message": "am 2aee0712: am e75477cb: am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE]\n\n* commit \u00272aee07124cad720587a8c51de5650b6b93ae9150\u0027:\n Support custom views using TimePickerDialog [DO NOT MERGE]\n" }, { "commit": "d023360aa03db1a7831a5697d49faa2575e4a9c3", "tree": "ae30464edf91f8c79079b5653214572a300db034", "parents": [ "2aee07124cad720587a8c51de5650b6b93ae9150", "484c88c3655991759dc64276404d0cf7e33b455f" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Apr 16 18:36:46 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 16 18:36:46 2014 +0000" }, "message": "am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]\n\n* commit \u0027484c88c3655991759dc64276404d0cf7e33b455f\u0027:\n Action bar rendering in layoutlib [DO NOT MERGE]\n" }, { "commit": "2aee07124cad720587a8c51de5650b6b93ae9150", "tree": "e01f685a9333bb6f476865ae934c74f26a3d641e", "parents": [ "f104f676e375c5c53eb049705740ab592b914bda", "e75477cb3bf0f2e18c1f0bb743a6189fbc07c2a2" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Apr 16 18:36:40 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 16 18:36:40 2014 +0000" }, "message": "am e75477cb: am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE]\n\n* commit \u0027e75477cb3bf0f2e18c1f0bb743a6189fbc07c2a2\u0027:\n Support custom views using TimePickerDialog [DO NOT MERGE]\n" }, { "commit": "bdd0ad79b9b027280bd371c7b6795b04ed89ac8f", "tree": "26f1d1b10fec448c6a46ba2a7dfec7fc46d01bf2", "parents": [ "f1e7187645f0b0388f7b97d742395efd228b347a" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Apr 15 19:30:35 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Apr 15 20:03:20 2014 -0700" }, "message": "Layoutlib tests now check methods return value [DO NOT MERGE]\n\nThe change is a cherry-pick of relevant fixes from the following\ncommits on master branch:\nthe followning commits:\n9be03c4e980d3058aeb3fd730da5f7d4a4a4f8a8 and\ne05bb956ce429618fd4f971a9dc708b9313c59ea\n\nChange-Id: I87cef323c4eaee4e9f60475f01156b276593fa50\n" }, { "commit": "f1e7187645f0b0388f7b97d742395efd228b347a", "tree": "1745ee38a0db1dad4b2f4d45378c56c8a13de779", "parents": [ "1b87390c9426c4bc9119829e9375d712dfde11c3" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Mar 11 18:02:44 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Apr 15 20:03:19 2014 -0700" }, "message": "Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n\nChange-Id: Icfb91e566666408802dadc0e2070991151b16b9d\n(cherry picked from commit bfec73c2db5a34ced248213edf5519c80727a65f)\n\nConflicts:\n\tcore/java/android/content/res/Resources.java\n\ttools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java\n" }, { "commit": "1b87390c9426c4bc9119829e9375d712dfde11c3", "tree": "d479157fa58e0526f187d0dc00cd85524746add0", "parents": [ "4ccc4bd54f85d86818f61d728c6361d2003ddd8e" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Feb 12 17:37:46 2014 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Apr 15 20:02:49 2014 -0700" }, "message": "Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]\n\nAdds MenuBuilderAccessor in addition to the cherry-picked changes.\n\nChange-Id: Ib7cc314079099c010f7d53849e204db36c410357\n(cherry-picked from commit 929eea6bc1824bf98d244550c0984ecf8ea98811)\n" }, { "commit": "4ccc4bd54f85d86818f61d728c6361d2003ddd8e", "tree": "3f613368ddaf738a9f0ee9754189068ba86c32e3", "parents": [ "acf0bce09fec2cabe871d7146aa62e9258fbf06d" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Dec 12 12:16:24 2013 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Apr 15 20:02:48 2014 -0700" }, "message": "Action bar rendering in layoutlib [DO NOT MERGE]\n\nThis also makes a couple of changes to the framework:\n1. ShareActionProvider - Use edit mode to execute activity chooser code.\n2. ActionBarImpl - add a new constructor for use by layoutlib.\n\nThis also relies on some changes to the plugin to pass the correct params.\n\nChange-Id: Ia30fef816afd91ec1e439734d56b59b1323bfee2\n(cherry-picked from 14bf0cef7eeed572a67c29a328581afac4decc20)\n" }, { "commit": "acf0bce09fec2cabe871d7146aa62e9258fbf06d", "tree": "1a9f0942c74d11d2952859e44236252765506eb2", "parents": [ "849a8208c88d38e55ec13a1fa76bf295fde96cb5" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Apr 09 15:14:37 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Apr 15 19:53:54 2014 -0700" }, "message": "Support custom views using TimePickerDialog [DO NOT MERGE]\n\nBug: http://b.android/com/61515\n\nChange-Id: I0dc3357be0c058adde9d3ea5b6796004b786fd34\n(cherry picked from commit 86e5218220a0e01f7eb574a2480bd91f9ebfae35)\n" }, { "commit": "eaa8a6b7feb4a520f48654b087223ccaf49b6a2f", "tree": "bd743d1906dfdd7ffcf93f2683cf2c1469477b1c", "parents": [ "c76faca60e0359e43e781eb3df403dc127733671", "a5c8d586f6ceff252336f72c6e15efbf4785e794" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Sat Apr 12 08:22:06 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Apr 12 08:22:06 2014 +0000" }, "message": "am a5c8d586: Fix build break due to layout lib.\n\n* commit \u0027a5c8d586f6ceff252336f72c6e15efbf4785e794\u0027:\n Fix build break due to layout lib.\n" }, { "commit": "a5c8d586f6ceff252336f72c6e15efbf4785e794", "tree": "bc328693917b000f3df782dde9cda796d86a776c", "parents": [ "e2dc69856879d41798545b2c113098195bf04fa6" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Apr 11 22:09:06 2014 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Apr 11 22:09:06 2014 -0700" }, "message": "Fix build break due to layout lib.\n\nChange-Id: I87b40125adad0a799214f6ebf0dc04ec7903efbf\n" }, { "commit": "c76faca60e0359e43e781eb3df403dc127733671", "tree": "10dfe5492d7822d46da205241170bc14029d6d68", "parents": [ "9e2fde9c8a3557d6e8d1f3971a421ecdf5c2ce07", "e2dc69856879d41798545b2c113098195bf04fa6" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat Apr 12 02:30:31 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Apr 12 02:30:31 2014 +0000" }, "message": "am e2dc6985: am f1334ccc: am 849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE]\n\n* commit \u0027e2dc69856879d41798545b2c113098195bf04fa6\u0027:\n Add DatePickerDialog to layoutlib [DO NOT MERGE]\n" }, { "commit": "e2dc69856879d41798545b2c113098195bf04fa6", "tree": "49c812b02e3abe1107ff7849bf506d19c7994ad8", "parents": [ "d912e1f6a111fb33118d116bd72da1a328041bca", "f1334ccc1522241c0efc2449ed8bf472a5b01204" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Sat Apr 12 02:26:09 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Apr 12 02:26:09 2014 +0000" }, "message": "am f1334ccc: am 849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE]\n\n* commit \u0027f1334ccc1522241c0efc2449ed8bf472a5b01204\u0027:\n Add DatePickerDialog to layoutlib [DO NOT MERGE]\n" }, { "commit": "73e78c75b770b3af0d48acac9c8565f7b4d035ff", "tree": "2d3d0758f2d5164cdb8935be6e0bbf6fd644b953", "parents": [ "80edaa676bd59409f8a82e12c035bee96e653004", "af42a91c118941d463b474574bf34bf05822350d" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Apr 11 11:35:19 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Apr 11 11:35:19 2014 +0000" }, "message": "am af42a91c: Fix another build breakage.\n\n* commit \u0027af42a91c118941d463b474574bf34bf05822350d\u0027:\n Fix another build breakage.\n" }, { "commit": "af42a91c118941d463b474574bf34bf05822350d", "tree": "141818180a138c12f09950cf0f2e9c0805faf2dd", "parents": [ "24c089a8b5871b331441d0858aa164364b7737cb" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Apr 11 12:28:10 2014 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Apr 11 11:31:07 2014 +0000" }, "message": "Fix another build breakage.\n\nCaused by 037c33eae74bee2774897d969d48947f9abe254f, which\nwas submitted without a checkbuild.\n\nChange-Id: I0d48f6b941cc98a30904cdfbd7bcb56ed509734e\n" }, { "commit": "849a8208c88d38e55ec13a1fa76bf295fde96cb5", "tree": "a37f48c4fcde4c020894dbe324dacc4d37643a7f", "parents": [ "331fa429cad1f464f0375a3466ba528b03c6e90d" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Feb 25 15:27:29 2014 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Apr 10 00:21:57 2014 +0000" }, "message": "Add DatePickerDialog to layoutlib [DO NOT MERGE]\n\nIncludes android.app.DatePickerDialog in the layoutlib.jar\n\nBug: http://b.android.com/28318\nChange-Id: I583dde4a8b88204bf98bfca8d91470e1aa4719ce\n(cherry picked from commit c2016d4073c61e87439d4fa14837b397a3c1630a)" }, { "commit": "a2ef5c0d4fb863c0382e77ae00f986a019b11cbe", "tree": "d6c10bedf5d762e0fc0bd10b38f381ccefefa248", "parents": [ "ecdf9b199ac9659c37c34c0b23084199acea80bf" ], "author": { "name": "Anton Krumin", "email": "antkrumin@google.com", "time": "Wed Mar 12 14:46:44 2014 -0700" }, "committer": { "name": "Anton Krumin", "email": "antkrumin@google.com", "time": "Wed Apr 09 16:59:48 2014 -0700" }, "message": "Pseudolocalizer improvements.\n\nFixes accented pseudolocalization and adds RTL pseudolocale.\n\nThis change contains following modifications in the pseudolocalization logic:\n1) zz_ZZ pseudolocale was removed;\n2) en_XA pseudolocale was added for pseudo-accented;\n3) ar_XB pseudolocale was added for pseudo-rtl;\n4) Pseudo RTL localization functionality was implemented;\n5) Text expansion functionality was implemented;\n6) Text bracketing was implemented;\n7) Couple of issues of previous implementation were fixed.\n\nChange-Id: I9f7f27bed717e39e82717d15c398decffc8bec3c\nSigned-off-by: Anton Krumin \u003cantkrumin@google.com\u003e\n" }, { "commit": "642421aa7f284817cc1a972a7f9c7a64696a0116", "tree": "e51a5b2c212bd95c4a052fcbd6b0bb0f0fce4976", "parents": [ "8f81d29558bb0c97187d5ae3a7ee696ec13b264a", "5c31e487c4577e1c47ee7c949325d6a13f0d462e" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Fri Apr 04 19:28:09 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Apr 04 19:28:09 2014 +0000" }, "message": "am 5c31e487: Merge \"Introduce new UI_MODE_TYPE_WATCH and qualifier.\" into klp-modular-dev\n\n* commit \u00275c31e487c4577e1c47ee7c949325d6a13f0d462e\u0027:\n Introduce new UI_MODE_TYPE_WATCH and qualifier.\n" }, { "commit": "5c31e487c4577e1c47ee7c949325d6a13f0d462e", "tree": "3ea98382d7d3cafd8f6af4fad749111dedc7b48b", "parents": [ "d10b65431547d66b41e4e282e9261453bb0658ff", "6c191299a73388cd593809c0b66bafbd08fd2982" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Fri Apr 04 19:24:09 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Apr 04 19:24:09 2014 +0000" }, "message": "Merge \"Introduce new UI_MODE_TYPE_WATCH and qualifier.\" into klp-modular-dev" }, { "commit": "6c191299a73388cd593809c0b66bafbd08fd2982", "tree": "86466cc5d46bb13d87ae71c906349957edd3a7fb", "parents": [ "8db6d9af58b9b81dbd764acd3f6a379afb539bf6" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Thu Apr 03 16:37:27 2014 -0400" }, "committer": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Fri Apr 04 15:21:53 2014 -0400" }, "message": "Introduce new UI_MODE_TYPE_WATCH and qualifier.\n\nDefault ui mode to watch if we have FEATURE_WATCH.\n\nBug:13395758\nChange-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd\n" }, { "commit": "72b2f536908f0f3249c59c630f1a06af371b2bfa", "tree": "915a1df70197f122c5fcfce34097dd39490ed401", "parents": [ "c333381b4c1b46f13f75388099cafb740844c497", "76c484de88317fbadc8a070fc333d4fb14355335" ], "author": { "name": "Xavier Ducrohet", "email": "xav@google.com", "time": "Thu Apr 03 22:24:47 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 03 22:24:47 2014 +0000" }, "message": "am 76c484de: am d93b0b67: am e448bcf7: Merge \"Add missing dependency in layoutlib build file [DO NOT MERGE]\" into klp-dev\n\n* commit \u002776c484de88317fbadc8a070fc333d4fb14355335\u0027:\n Add missing dependency in layoutlib build file [DO NOT MERGE]\n" }, { "commit": "76c484de88317fbadc8a070fc333d4fb14355335", "tree": "122703526314e3ed4c2ba6f740ad0433dbd676bf", "parents": [ "8db6d9af58b9b81dbd764acd3f6a379afb539bf6", "d93b0b67754f6d06407086278298f44156458216" ], "author": { "name": "Xavier Ducrohet", "email": "xav@google.com", "time": "Thu Apr 03 22:17:10 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 03 22:17:10 2014 +0000" }, "message": "am d93b0b67: am e448bcf7: Merge \"Add missing dependency in layoutlib build file [DO NOT MERGE]\" into klp-dev\n\n* commit \u0027d93b0b67754f6d06407086278298f44156458216\u0027:\n Add missing dependency in layoutlib build file [DO NOT MERGE]\n" }, { "commit": "e345507ca4b7b83c6e0446788f4404eb697f945b", "tree": "e56594bb91a2a8c5eec8831fe29fa06f30dda3c3", "parents": [ "dc5e02bdccbbc60ede21ae706f06c696b6983812" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Mar 31 16:11:13 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Mar 31 23:15:52 2014 +0000" }, "message": "Add missing dependency in layoutlib build file [DO NOT MERGE]\n\nAdd missing dependency on built_ext_data\n\nChange-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4\n(cherry picked from commit 411b9691e39c0bdd0dafdda7db2737b99b45769e)\n" }, { "commit": "587e420ea9fb5578985e32d31b8791e773a5861e", "tree": "15077888a74562055e0d891a898f92b27adfec6e", "parents": [ "af89d7e21f5d7cbe74ff4ce014d8ab2db1a6fc27", "004ceaaa4d3ddfc66ba3f3635e987c2ddc7f2d09" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Mar 27 21:05:06 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 27 21:05:06 2014 +0000" }, "message": "am 004ceaaa: am 55a65509: Merge \"Reduce warning verbosity in aapt\"\n\n* commit \u0027004ceaaa4d3ddfc66ba3f3635e987c2ddc7f2d09\u0027:\n Reduce warning verbosity in aapt\n" }, { "commit": "e119b22146c602dac1e8bdfdb325b6c83fc66d66", "tree": "d318c4a106673041cf3b47733a8dea78463aaad5", "parents": [ "88517170cbb09b45324d5b457a0e5e840cc7d09b" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Mar 20 18:04:57 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Mon Mar 24 10:50:34 2014 -0700" }, "message": "Reduce warning verbosity in aapt\n\n- Attributed source of problems to the correct file.\n- Only verify string localizations against valid\n locales.\nBug:13140015\nChange-Id: I9dabc5efa0510649caee8af0c8ebb803d6f48269\n" }, { "commit": "6393875024e3b2ee6916d718d79dfbeb722537c1", "tree": "a18aa6e00fcf113d9894e917ef58b819d4d387d0", "parents": [ "d8b170799f1cb00825a4a947901d4b214d20c5a1", "c0232642b74517aa2717673f0811ba65c620f491" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Mar 14 14:22:30 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 14 14:22:30 2014 +0000" }, "message": "am c0232642: am 629daddd: Merge \"Fix layoutlib build.\"\n\n* commit \u0027c0232642b74517aa2717673f0811ba65c620f491\u0027:\n Fix layoutlib build.\n" }, { "commit": "c73991bda0ad7821e27c20940368b0c0212c5dc4", "tree": "49148468d55bbb93cf099bfd25a7162059e6ab34", "parents": [ "f3a2895a31069a7c01c69d011b290fcfb3298b3c" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Mar 14 14:10:30 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Mar 14 14:10:30 2014 +0000" }, "message": "Fix layoutlib build.\n\nWas using private data structures from libcore.\n\nChange-Id: I5bd43190081891659e18b5c871686e6078efcc81\n" }, { "commit": "f978f16e50374681b0ade2d14a5e39cedaea6c2f", "tree": "99fc859d828deff24767e2cfb1f92293adc78f4d", "parents": [ "a54f852d3df7ac2e245ccffe8409b217330e5092", "c76345a39629b23997ca46b6518a2f0e45384ffc" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Mar 11 16:39:13 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Mar 11 16:39:13 2014 -0700" }, "message": "resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp\n\nChange-Id: Id0aae224e17651bc07aa3f5b1a06923603d025b8\n" }, { "commit": "792f38ddd9e8d25b2c8bf0d67363dbfa56550636", "tree": "49652a344cb8ea971b3a35a43ff36edbe1644c48", "parents": [ "a79af3647f7f93825b84cc25187527b5aac60a69", "0d7ebc51ffb63f886af2196f05910925126726b9" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Mar 11 21:22:39 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 11 21:22:40 2014 +0000" }, "message": "Merge \"Fix the delegate method signatures in LayoutLib\"" }, { "commit": "8272c84cb531a4f148f0b0a31d8359d381137378", "tree": "bdd6ace80e9c97b8509bdcde2fd52d09e6ae9102", "parents": [ "e3318addc9c42a7b6d9d1ba8eaff786236b6dec0", "bbf826659e8e5d0be683b2459207c495303d53b6" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Mar 10 10:47:45 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 10 10:47:45 2014 +0000" }, "message": "am bbf82665: am 6e2fb587: Merge \"LP64: Make 9 patches architecture agnostic.\"\n\n* commit \u0027bbf826659e8e5d0be683b2459207c495303d53b6\u0027:\n LP64: Make 9 patches architecture agnostic.\n" }, { "commit": "6381dd4ff212a95be30d2b445d40ff419ab076b4", "tree": "ea96f7e229cafae41f7be46a3cf0345edd2dc869", "parents": [ "3fc3b9fd1bf71351bf1ff2d49d6e10b6acabf068" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Mar 03 17:12:03 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Mar 10 10:00:02 2014 +0000" }, "message": "LP64: Make 9 patches architecture agnostic.\n\nThe Res_png_9patch struct had several pointer members\nwhose size differed between 32 and 64 bit platforms.\n\nThese members have been replaced by uint32_t offsets\nto serialized data. The serialized form for 9patches\nplaces a Res_png_9patch object at the beginning of\nserialized data, followed by int32_t arrays of xDivs,\nyDivs and colors.\n\nNote that these offsets are not strictly required,\nsince they can be computed from the values of numXDivs,\nnumYDivs \u0026 numColors, however they are called in tight\nloops so having them computed once is a beneficial.\n\nThis change also removed the unused patch_equals function\nfrom aapt\u0027s Image.cpp.\n\nChange-Id: I3b9ac8ae5c05510d41377cae4dff1c69b40c2531\n" }, { "commit": "032305fbcf1f1923030723d60621d8bbfa138511", "tree": "998220b89b573a4746c873824560c2883b8dc3c2", "parents": [ "f5f4d9306011ea1b10d25c959334f3e62df4447e", "b559b37150d24411f0b5ef102ced8d5acf858a0e" ], "author": { "name": "Tim Kilbourn", "email": "tkilbourn@google.com", "time": "Sat Mar 08 01:55:00 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Mar 08 01:55:00 2014 +0000" }, "message": "am b559b371: Merge \"Dump leanback info in aapt dump badging.\" into klp-modular-dev\n\n* commit \u0027b559b37150d24411f0b5ef102ced8d5acf858a0e\u0027:\n Dump leanback info in aapt dump badging.\n" }, { "commit": "f5f4d9306011ea1b10d25c959334f3e62df4447e", "tree": "2a45b283ae061b160bb55a51aaa4e5135de15ba3", "parents": [ "6f9f8e7aad2f74bc2089a081139111012e62f7db", "74bebf6faed2d34814ffc3d46664330ea568f7b2" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Sat Mar 08 01:54:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Mar 08 01:54:52 2014 +0000" }, "message": "am 74bebf6f: Exclude the host aapt and aidl from PDK build.\n\n* commit \u002774bebf6faed2d34814ffc3d46664330ea568f7b2\u0027:\n Exclude the host aapt and aidl from PDK build.\n" }, { "commit": "b559b37150d24411f0b5ef102ced8d5acf858a0e", "tree": "5bfa7c7379d56fa6ae93c5f54ffe8643b6112f43", "parents": [ "74bebf6faed2d34814ffc3d46664330ea568f7b2", "0a5a5d6996e54a927af750e122a1275d64f77ee5" ], "author": { "name": "Tim Kilbourn", "email": "tkilbourn@google.com", "time": "Sat Mar 08 00:55:47 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Mar 08 00:55:48 2014 +0000" }, "message": "Merge \"Dump leanback info in aapt dump badging.\" into klp-modular-dev" }, { "commit": "0a5a5d6996e54a927af750e122a1275d64f77ee5", "tree": "2530e6edb6200ff28ee87f58fbb28e2a0b15dc37", "parents": [ "d1862dac05e4302761c8d741a3286fe5eb6f1174" ], "author": { "name": "Tim Kilbourn", "email": "tkilbourn@google.com", "time": "Fri Mar 07 15:12:50 2014 -0800" }, "committer": { "name": "Tim Kilbourn", "email": "tkilbourn@google.com", "time": "Fri Mar 07 16:47:42 2014 -0800" }, "message": "Dump leanback info in aapt dump badging.\n\nLeanback launcher activities are reported, including the banner.\n\nChange-Id: Ifa496736ad3ba4239ec95e166768af895ff4dc53\n" }, { "commit": "74bebf6faed2d34814ffc3d46664330ea568f7b2", "tree": "4c77c094ba71d651e37abda346444295724a3a76", "parents": [ "01b5e765e59c14cdfb62f1a8684e9116a46874d2" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Fri Mar 07 15:55:14 2014 -0800" }, "committer": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Fri Mar 07 15:56:14 2014 -0800" }, "message": "Exclude the host aapt and aidl from PDK build.\n\nBug: 13028632\nChange-Id: I0f774b19be77462d0fa271088a4a5a152729d13c\n" }, { "commit": "0d7ebc51ffb63f886af2196f05910925126726b9", "tree": "ddbe432e4e9add6bf613c827369cee879582de01", "parents": [ "a0b4d0ce471cf10888bac4d4ec5b97fd562ad756" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Mar 05 19:23:48 2014 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Mar 05 19:23:48 2014 -0800" }, "message": "Fix the delegate method signatures in LayoutLib\n\nChange-Id: I262c285c1047958afdb024724959d5afb3552802\n" }, { "commit": "a05e752615fbfb50196d59dfb9c96dc7cf6c63f1", "tree": "26816560d9c39cd60cddc2ec3ecbb1339dd30865", "parents": [ "75870cf391eb6f1ec91f512e0a6f28840093d413", "9c6f41e3eb2258d52480be04dd8916a10f8be8db" ], "author": { "name": "David \u0027Digit\u0027 Turner", "email": "digit@google.com", "time": "Wed Mar 05 23:18:20 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:18:20 2014 +0000" }, "message": "am 9c6f41e3: am be7b8f4f: Merge \"aidl: Support building with updated host sysroot.\"\n\n* commit \u00279c6f41e3eb2258d52480be04dd8916a10f8be8db\u0027:\n aidl: Support building with updated host sysroot.\n" }, { "commit": "be7b8f4f4c62239ad20202e4bbe8120d5e3dcf82", "tree": "29189b242e8e3563139ec664b893307fb7938fe2", "parents": [ "5c126c3d1703d8bef9a55dcc01f1fabf17811f60", "ea6d2197baff71a45f2bf95d3efbdef501cca76c" ], "author": { "name": "David \u0027Digit\u0027 Turner", "email": "digit@google.com", "time": "Wed Mar 05 23:10:44 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 05 23:10:45 2014 +0000" }, "message": "Merge \"aidl: Support building with updated host sysroot.\"" }, { "commit": "ea6d2197baff71a45f2bf95d3efbdef501cca76c", "tree": "cdc6f8bdde4b9c1916a83e61d0adb42c66c10f2f", "parents": [ "2ba70fd49bfcbb516e75c198c106764609335feb" ], "author": { "name": "David \u0027Digit\u0027 Turner", "email": "digit@google.com", "time": "Tue Mar 04 16:43:41 2014 +0100" }, "committer": { "name": "David \u0027Digit\u0027 Turner", "email": "digit@google.com", "time": "Wed Mar 05 23:57:46 2014 +0100" }, "message": "aidl: Support building with updated host sysroot.\n\nThis patch fixes tools/aidl/Type.cpp to compile with\na more recent SDK host toolchain sysroot (that has not\nbeen submitted yet).\n\nThe main issue is that the code uses ssize_t which is\ndefined in \u003csys/types.h\u003e, but didn\u0027t include the header\ndirectly.\n\nApparently, this no longer compiles when using the Ubuntu\n10.04 libc6-dev headers (the current SDK toolchain is\nbased on Ubuntu 8.04), so perform an explicit include\nto fix this.\n\nNOTE: This doesn\u0027t break the Windows SDK build.\n\nChange-Id: Idcacf8f8d1c606b39bf8aa75ab409aa0c2a3cd5a\n" }, { "commit": "160c39d8a53793cb17dd8a9312d56eafced3cc0d", "tree": "b0a48ca6a388061e3cb8b95c6b5eebbf37a8a619", "parents": [ "9d50308b3e51b871e541397384d8c59d7717bd56", "26026c62788f508f9de0df608dd7043e7d1399f6" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Sat Mar 01 17:30:34 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Mar 01 17:30:34 2014 +0000" }, "message": "am 26026c62: am dd72b6e7: Merge \"Fix indirect misuse of .\"\n\n* commit \u002726026c62788f508f9de0df608dd7043e7d1399f6\u0027:\n Fix indirect misuse of $(my-dir).\n" }, { "commit": "f794d6342570fe18d035a184dd4c8109e90441ea", "tree": "0c29926270e34b0faee02ad9ba2ca52cf40d563d", "parents": [ "4a79484648262d5d0dc9e72c3d9cf36c77cca599" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Fri Feb 28 18:04:37 2014 -0800" }, "committer": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Fri Feb 28 18:04:37 2014 -0800" }, "message": "Fix indirect misuse of $(my-dir).\n\nChange-Id: I20a98a8e1378da3a53e6a6d599c8fc0100f7f87a\n" }, { "commit": "ec84ada6e8f3dad738810e2f1cd085defbc6d0ab", "tree": "d78b904f6b31fb5c9f03e7e35664601c0ce3bf0b", "parents": [ "43e412cb67ad47c5c9d68ac8cbd12356aca97603", "5e5602da5fa9cd2e1d135b2310af2a8352f65e8d" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Feb 27 23:34:34 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 27 23:34:34 2014 +0000" }, "message": "am 5e5602da: am 0c72b769: Merge \"Update layoutlib method for SystemClock\"\n\n* commit \u00275e5602da5fa9cd2e1d135b2310af2a8352f65e8d\u0027:\n Update layoutlib method for SystemClock\n" }, { "commit": "5ac6a9e9b72f9daa5a7d4ec073b2e5d6af8b3def", "tree": "984125274c913f099f6699a73d0fcc0c06515011", "parents": [ "bbfc08b3abc0934f67659f3238eb79dcac838c17" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Feb 24 14:22:29 2014 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Feb 24 14:22:29 2014 -0800" }, "message": "Update layoutlib method for SystemClock\n\nUpdate layoutlib to reflect changes from\nhttp://android-review.googlesource.com/83061/\n\nChange-Id: If7326f3af2a97271ad1465382944e1f078b965d8\n" }, { "commit": "21c5c8e600d635df1d5bbfb9f4db6d0f60b9e2ad", "tree": "9b4509e070e1a5aa5b484eaa3b52335c5b3f21f0", "parents": [ "c139177b13427ea3ea1bc88364136439125848af", "9edf7a1159b528afa056e0d61ee4487ed310fe4c" ], "author": { "name": "Xavier Ducrohet", "email": "xav@google.com", "time": "Thu Feb 20 17:53:20 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 20 17:53:20 2014 +0000" }, "message": "am 9edf7a11: am 2cb9147f: am 55542ee6: am 3e637042: Merge \"Set default text style in layoutlib as NORMAL [DO NOT MERGE]\" into klp-dev\n\n* commit \u00279edf7a1159b528afa056e0d61ee4487ed310fe4c\u0027:\n Set default text style in layoutlib as NORMAL [DO NOT MERGE]\n" }, { "commit": "c139177b13427ea3ea1bc88364136439125848af", "tree": "d9c14387c3c53b8804169f4ffdc6629d74e78c5d", "parents": [ "a79ac472d71de6d13f3561012ca0e870bd9fe04b", "65521c3cf169808cd02ce09a7344bc633d51c1fc" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 20 17:53:17 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 20 17:53:17 2014 +0000" }, "message": "am 65521c3c: am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]\n\n* commit \u002765521c3cf169808cd02ce09a7344bc633d51c1fc\u0027:\n Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]\n" }, { "commit": "9edf7a1159b528afa056e0d61ee4487ed310fe4c", "tree": "693a938d06c7cc9157dab1d9bc88ca7dc243905d", "parents": [ "65521c3cf169808cd02ce09a7344bc633d51c1fc", "2cb9147fc49e6474eaf30fd833e43df10e42b899" ], "author": { "name": "Xavier Ducrohet", "email": "xav@google.com", "time": "Thu Feb 20 17:49:32 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 20 17:49:32 2014 +0000" }, "message": "am 2cb9147f: am 55542ee6: am 3e637042: Merge \"Set default text style in layoutlib as NORMAL [DO NOT MERGE]\" into klp-dev\n\n* commit \u00272cb9147fc49e6474eaf30fd833e43df10e42b899\u0027:\n Set default text style in layoutlib as NORMAL [DO NOT MERGE]\n" }, { "commit": "65521c3cf169808cd02ce09a7344bc633d51c1fc", "tree": "e4ded56bdc4838b1cad358bf59f6defd6a84a149", "parents": [ "744d3473f8a0f9f95e3fdf83670faf6d1551839e", "ca4b9a77e7d20703287b33b203b2582bd43f7792" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 20 17:49:27 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 20 17:49:27 2014 +0000" }, "message": "am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]\n\n* commit \u0027ca4b9a77e7d20703287b33b203b2582bd43f7792\u0027:\n Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]\n" }, { "commit": "2cb9147fc49e6474eaf30fd833e43df10e42b899", "tree": "1c7669753ee3355ffc7a699a225cf5afda97794c", "parents": [ "ca4b9a77e7d20703287b33b203b2582bd43f7792", "55542ee6449bd580f61bc005726b5c87773fbe25" ], "author": { "name": "Xavier Ducrohet", "email": "xav@google.com", "time": "Thu Feb 20 17:46:05 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 20 17:46:05 2014 +0000" }, "message": "am 55542ee6: am 3e637042: Merge \"Set default text style in layoutlib as NORMAL [DO NOT MERGE]\" into klp-dev\n\n* commit \u002755542ee6449bd580f61bc005726b5c87773fbe25\u0027:\n Set default text style in layoutlib as NORMAL [DO NOT MERGE]\n" }, { "commit": "ca4b9a77e7d20703287b33b203b2582bd43f7792", "tree": "3a1cc294047daddecd2a24aa49c68b6433678d0c", "parents": [ "4c68c4ed463f7f83d05f86ed11046195829028ed", "e92c8542a5cf1160a1b701b9f176af64ba46d68d" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 20 17:46:02 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 20 17:46:02 2014 +0000" }, "message": "am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]\n\n* commit \u0027e92c8542a5cf1160a1b701b9f176af64ba46d68d\u0027:\n Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]\n" }, { "commit": "3e6370425ea3ac4e5d89ce042512913062212ccc", "tree": "1ca4107d175ed09bd0f80397a96afcdc094876e5", "parents": [ "01825b7aa3c864426c78c08c2f6004a8362c2b47", "13aea18b34e527cffeaa6cb81f5ecb7c4a66cb11" ], "author": { "name": "Xavier Ducrohet", "email": "xav@google.com", "time": "Thu Feb 20 17:41:07 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 20 17:41:08 2014 +0000" }, "message": "Merge \"Set default text style in layoutlib as NORMAL [DO NOT MERGE]\" into klp-dev" }, { "commit": "01825b7aa3c864426c78c08c2f6004a8362c2b47", "tree": "24d1e0a27130471d0baebd86f4cdd94f076a8e62", "parents": [ "45dbfcc781a3926d22571b6ccfa3f27ec896f119" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Feb 19 10:53:27 2014 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Feb 19 20:17:47 2014 +0000" }, "message": "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]\n\nFor these font families, text was always rendered as italic. This\nchangeset fixes the issue.\n\nBug: http://b.android.com/57221\nChange-Id: Ic8a299bd1e555f5bb914cd3d2fe72917ec7f471a\n(cherry picked from commit e327212adde1136807bbdf052e8cc3861f8a6aba)\n" }, { "commit": "13aea18b34e527cffeaa6cb81f5ecb7c4a66cb11", "tree": "886399c5ad8374602306c9db0501e444540239ba", "parents": [ "45dbfcc781a3926d22571b6ccfa3f27ec896f119" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Feb 19 11:05:02 2014 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed Feb 19 20:17:00 2014 +0000" }, "message": "Set default text style in layoutlib as NORMAL [DO NOT MERGE]\n\nIf a style doesn\u0027t specify text style (normal/bold/italic/bold-italic)\nthen default to normal instead of throwing an error.\n\nBug: http://b.android.com/61358\nChange-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1\n(cherry picked from commit 0acfb16dcd95468fe032204f54618e86becfd1eb)\n" }, { "commit": "8c1fc83445f8dce7e6d0789feeed8bf98d33bf01", "tree": "b9eae6651529003e33abaea6a3f18fd17266fb42", "parents": [ "982931c72b6cd00c5eea28efc4b086f47f7aca17", "28879bbfe89dc4bf2067a7183975ecffb82f68e6" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Feb 17 11:06:38 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Feb 17 11:06:38 2014 +0000" }, "message": "am 28879bbf: am be57fca4: Merge \"Extended locales in AAPT / AssetManager.\"\n\n* commit \u002728879bbfe89dc4bf2067a7183975ecffb82f68e6\u0027:\n Extended locales in AAPT / AssetManager.\n" }, { "commit": "788fa41482b9d398591b7db8b0b01839029611ad", "tree": "ab94d4040351d79cca717a8b7e21fc6be5d0fcb5", "parents": [ "48620f1d1b03e1cb4e0dce4999e0a4c2daf3a1b2" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jan 21 15:32:36 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Feb 14 14:08:57 2014 +0000" }, "message": "Extended locales in AAPT / AssetManager.\n\nSupport 3 letter language codes, script codes \u0026\nvariants. The bulk of the changes are related to\nthe implementation of command line filtering of\nlocales etc. The previous code assumed that the\nvalue of each \"axis\" (locale, density, size etc.)\ncould be represented by a 4 byte type. This is\nno longer the case.\n\nThis change introduces a new class, AaptLocaleValue\nwhich holds a (normalized) locale parsed from a\ndirectory name or a filter string. This class takes\nresponsibility for parsing locales as well as\nwriting them to ResTable_config structures, which is\ntheir representation in the resource table.\n\nThis includes minor changes at the java / JNI level\nfor AssetManager. We now call locale.toLanguageTag()\nto give the native layer a well formed BCP-47 tag.\nI\u0027ve removed some duplicated parsing code in\nAssetManager.cpp and replaced them with functions on\nResTable_config. The native getLocales function has\nbeen changed to return well formed BCP-47 locales as\nwell, so that the corresponding java function can use\nLocale.forLanguageTag to construct a Locale object\nout of it.\n\nFinally, this change introduces default and copy\nconstructors for ResTable_config to prevent having\nto memset() the associated memory to 0 on every\nstack allocation.\n\n(cherry-picked from commit 91447d88f2bdf9c2bf8d1a53570efef6172fba74)\n\nChange-Id: I1b43086860661012f949fb8e5deb7df44519b854\n" }, { "commit": "f7193bf89780039cf924dd7d1bb67f4830517231", "tree": "968d3b95d5b0b50d7c24e3bc8b8fdb5123e5292a", "parents": [ "edb555edceaf51f7ef40e35257a4b00c06a68e72", "d9f9da396b41f394991f676bc74dcfc59c7070a8" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Feb 10 19:56:58 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Feb 10 19:56:58 2014 +0000" }, "message": "am d9f9da39: am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.\n\n* commit \u0027d9f9da396b41f394991f676bc74dcfc59c7070a8\u0027:\n Improve text rendering and measurement.\n" }, { "commit": "d9f9da396b41f394991f676bc74dcfc59c7070a8", "tree": "2ec73ee9c5d5264150509a26ae74f1829e2d14cb", "parents": [ "92ade49ecaa23cd77510ee0bc1dbc6355eb581ed", "56b86debcfaf8f661011702d31854bb3804f5fe1" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Feb 10 19:53:48 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Feb 10 19:53:48 2014 +0000" }, "message": "am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.\n\n* commit \u002756b86debcfaf8f661011702d31854bb3804f5fe1\u0027:\n Improve text rendering and measurement.\n" }, { "commit": "56b86debcfaf8f661011702d31854bb3804f5fe1", "tree": "2cd0134d97db14656940b12b9e1d53193e643a5b", "parents": [ "332aefe931fe38291fa07fe20c9018eed1c8c0d5", "1c91b1f7a2da5e5b1996217228399ef958c2be0c" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon Feb 10 19:50:58 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Feb 10 19:50:58 2014 +0000" }, "message": "am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.\n\n* commit \u00271c91b1f7a2da5e5b1996217228399ef958c2be0c\u0027:\n Improve text rendering and measurement.\n" }, { "commit": "45dbfcc781a3926d22571b6ccfa3f27ec896f119", "tree": "4ac00a5096da65498311eb0c81e7a900cba26117", "parents": [ "3bf38b4165877274067a385cfe6472639a203a58" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue Jan 07 11:58:44 2014 -0800" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 16:27:14 2014 -0800" }, "message": "Improve text rendering and measurement.\n\n1. Fix a bug where baseline of the run was modified while rendering\nresulting in crooked text in some cases.\n\n2. Use GlyphVector.getLogicalBounds() for text measurement which is more\naccurate than getVisualBounds().\n\n3. This change also optimizes text rendering by not computing the advances\nfor individual glyphs when not needed.\n\nChange-Id: I66792c4d8f50eaf29afa70bccca1e6c812a3fa28\n" }, { "commit": "7bd287b70a1c95c96663a6028e9809fd3844f55a", "tree": "cf0819f62bb5013c621e72d4452f382a7fac8377", "parents": [ "6a9cbd5a2d56782e94b870735df51d32314684d8", "ea2ec77f9538de2ea795d3e257f19e8cff659665" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 03:06:38 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 06 03:06:38 2014 +0000" }, "message": "am ea2ec77f: am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge \"Add methods for Time_Delegate\" into klp-dev\n\n* commit \u0027ea2ec77f9538de2ea795d3e257f19e8cff659665\u0027:\n Add methods for Time_Delegate\n" }, { "commit": "6a9cbd5a2d56782e94b870735df51d32314684d8", "tree": "0a669f3fda687d498b3a12a560693e36ea982304", "parents": [ "f9021e48bedc9fda9bff4e33244e689fb06e8ecb", "a0023027e5b7245e2cef304d96826a7ae1c361aa" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 03:06:35 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 06 03:06:35 2014 +0000" }, "message": "am a0023027: am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge \"Optimize layout rendering in layoutlib\" into klp-dev\n\n* commit \u0027a0023027e5b7245e2cef304d96826a7ae1c361aa\u0027:\n Optimize layout rendering in layoutlib\n" }, { "commit": "f9021e48bedc9fda9bff4e33244e689fb06e8ecb", "tree": "092e281185ee6eeb5b1aff39a3530a536f38747a", "parents": [ "1bcc286def646f98747bce2c4dedb0737d5fcf9d", "bd762373964eb3cb71bdd79cbf82c27faa22699d" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 03:06:32 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 06 03:06:32 2014 +0000" }, "message": "am bd762373: am 096e4359: am f2f108fe: am a955314d: Merge \"Add missing files to fix libphonenumber for layoutlib.\" into klp-dev\n\n* commit \u0027bd762373964eb3cb71bdd79cbf82c27faa22699d\u0027:\n Add missing files to fix libphonenumber for layoutlib.\n" }, { "commit": "1bcc286def646f98747bce2c4dedb0737d5fcf9d", "tree": "621f5f45cfccd9ec1afdf8be0f8c36b40309eb2b", "parents": [ "1bceb9823f7af258489c91fa201214805744fa4a", "db0427a0ac986e0823e7bbe9b7c12a97aabe133e" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 03:06:29 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 06 03:06:29 2014 +0000" }, "message": "am db0427a0: am 5800b19a: am 50b0ce4e: am fd8cba3a: Merge \"Fix the measurement of text bounds.\" into klp-dev\n\n* commit \u0027db0427a0ac986e0823e7bbe9b7c12a97aabe133e\u0027:\n Fix the measurement of text bounds.\n" }, { "commit": "1bceb9823f7af258489c91fa201214805744fa4a", "tree": "51eba6176b55e5351433cdf1263110af2b963161", "parents": [ "14d74b82363e1a72b967590ee7118b239b276fb4", "650d30c5ec3c0b345651a56c45eb334fabf51b17" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 03:06:26 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 06 03:06:26 2014 +0000" }, "message": "am 650d30c5: am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library.\n\n* commit \u0027650d30c5ec3c0b345651a56c45eb334fabf51b17\u0027:\n Fix a bug in Nine Patch library.\n" }, { "commit": "ea2ec77f9538de2ea795d3e257f19e8cff659665", "tree": "69562e01b637fa71ecb2bb5749af6c6edf47d8f5", "parents": [ "a0023027e5b7245e2cef304d96826a7ae1c361aa", "3adb34ee079504b5854d23bc7a38dafc0a985219" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 03:03:54 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 06 03:03:54 2014 +0000" }, "message": "am 3adb34ee: am 9fcfbfe2: am 3bf38b41: Merge \"Add methods for Time_Delegate\" into klp-dev\n\n* commit \u00273adb34ee079504b5854d23bc7a38dafc0a985219\u0027:\n Add methods for Time_Delegate\n" }, { "commit": "a0023027e5b7245e2cef304d96826a7ae1c361aa", "tree": "e496da34a28d47cfca3893dba89b20c81f782362", "parents": [ "bd762373964eb3cb71bdd79cbf82c27faa22699d", "23de8dc2625d4aeb4dc9085c5865ed571f96261a" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 03:03:50 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 06 03:03:50 2014 +0000" }, "message": "am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge \"Optimize layout rendering in layoutlib\" into klp-dev\n\n* commit \u002723de8dc2625d4aeb4dc9085c5865ed571f96261a\u0027:\n Optimize layout rendering in layoutlib\n" }, { "commit": "bd762373964eb3cb71bdd79cbf82c27faa22699d", "tree": "d522224fdadddc6766bfc337e1e44c800ed3de6a", "parents": [ "db0427a0ac986e0823e7bbe9b7c12a97aabe133e", "096e43590381b218cec88adeac4261427c19e139" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 03:03:45 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 06 03:03:45 2014 +0000" }, "message": "am 096e4359: am f2f108fe: am a955314d: Merge \"Add missing files to fix libphonenumber for layoutlib.\" into klp-dev\n\n* commit \u0027096e43590381b218cec88adeac4261427c19e139\u0027:\n Add missing files to fix libphonenumber for layoutlib.\n" }, { "commit": "db0427a0ac986e0823e7bbe9b7c12a97aabe133e", "tree": "55882a40ca78dc961f9e14fe80bf8aa8c2594b38", "parents": [ "650d30c5ec3c0b345651a56c45eb334fabf51b17", "5800b19a7a3422620cb28e2327a96bf824f5cc9c" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 03:03:41 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 06 03:03:41 2014 +0000" }, "message": "am 5800b19a: am 50b0ce4e: am fd8cba3a: Merge \"Fix the measurement of text bounds.\" into klp-dev\n\n* commit \u00275800b19a7a3422620cb28e2327a96bf824f5cc9c\u0027:\n Fix the measurement of text bounds.\n" }, { "commit": "650d30c5ec3c0b345651a56c45eb334fabf51b17", "tree": "174dc93af6d0c3050a5b74114beda7084fcb7233", "parents": [ "1bf2b873470d2ba8a4ac218da73516cc2b20aa76", "b156c0197d052dd4be71ad2b858acc01f50ad49f" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 03:03:36 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 06 03:03:36 2014 +0000" }, "message": "am b156c019: am d5129e75: am 8a892279: Fix a bug in Nine Patch library.\n\n* commit \u0027b156c0197d052dd4be71ad2b858acc01f50ad49f\u0027:\n Fix a bug in Nine Patch library.\n" }, { "commit": "3adb34ee079504b5854d23bc7a38dafc0a985219", "tree": "793e48d450d4403e70d0369f57565050830aa311", "parents": [ "23de8dc2625d4aeb4dc9085c5865ed571f96261a", "9fcfbfe296d7033ee031171f61b3a33044abee42" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 02:59:51 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 06 02:59:51 2014 +0000" }, "message": "am 9fcfbfe2: am 3bf38b41: Merge \"Add methods for Time_Delegate\" into klp-dev\n\n* commit \u00279fcfbfe296d7033ee031171f61b3a33044abee42\u0027:\n Add methods for Time_Delegate\n" }, { "commit": "23de8dc2625d4aeb4dc9085c5865ed571f96261a", "tree": "7cead0c4403f7f6719d0885e24583b6cc00b17ad", "parents": [ "096e43590381b218cec88adeac4261427c19e139", "28e049ef73f5d9301a198ac53535442b697b7ef4" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 02:59:48 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 06 02:59:48 2014 +0000" }, "message": "am 28e049ef: am 0db6e6a5: Merge \"Optimize layout rendering in layoutlib\" into klp-dev\n\n* commit \u002728e049ef73f5d9301a198ac53535442b697b7ef4\u0027:\n Optimize layout rendering in layoutlib\n" }, { "commit": "096e43590381b218cec88adeac4261427c19e139", "tree": "3468c41076694dcf3c861a8a1609d80d8d5527a9", "parents": [ "5800b19a7a3422620cb28e2327a96bf824f5cc9c", "f2f108fe86337a429a0940f264761dbc27f817fe" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 02:59:45 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 06 02:59:45 2014 +0000" }, "message": "am f2f108fe: am a955314d: Merge \"Add missing files to fix libphonenumber for layoutlib.\" into klp-dev\n\n* commit \u0027f2f108fe86337a429a0940f264761dbc27f817fe\u0027:\n Add missing files to fix libphonenumber for layoutlib.\n" }, { "commit": "5800b19a7a3422620cb28e2327a96bf824f5cc9c", "tree": "fd43641e01bd5a1334b5bff319688cde999bfa30", "parents": [ "b156c0197d052dd4be71ad2b858acc01f50ad49f", "50b0ce4e8ed353ed841782aeb58963bc084f2e16" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 02:59:41 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 06 02:59:41 2014 +0000" }, "message": "am 50b0ce4e: am fd8cba3a: Merge \"Fix the measurement of text bounds.\" into klp-dev\n\n* commit \u002750b0ce4e8ed353ed841782aeb58963bc084f2e16\u0027:\n Fix the measurement of text bounds.\n" }, { "commit": "b156c0197d052dd4be71ad2b858acc01f50ad49f", "tree": "40b76afb8c1b9db38409324e6a7fc7e9fa187755", "parents": [ "3e80914d1683d1641fd6a01f14f126452e17f5c7", "d5129e75968030620a1372e39fcfbc17fe584e17" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 02:59:38 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 06 02:59:38 2014 +0000" }, "message": "am d5129e75: am 8a892279: Fix a bug in Nine Patch library.\n\n* commit \u0027d5129e75968030620a1372e39fcfbc17fe584e17\u0027:\n Fix a bug in Nine Patch library.\n" }, { "commit": "3bf38b4165877274067a385cfe6472639a203a58", "tree": "efa8d2e537c4c424bab9e9544d55bcc0fcff82be", "parents": [ "0db6e6a567e25d560586863c7be654a0c1da5795", "eb3c5459eb893061779b102236a81069efdbef73" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 02:06:02 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 06 02:06:02 2014 +0000" }, "message": "Merge \"Add methods for Time_Delegate\" into klp-dev" }, { "commit": "0db6e6a567e25d560586863c7be654a0c1da5795", "tree": "b83391c46502ec44bdf297bed1db7f2aadb0eb70", "parents": [ "a955314d905f8567c852226ce4f74994826e8777", "35d56c0d67537e56fafebd8edf790026644fe8de" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 02:05:42 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 06 02:05:42 2014 +0000" }, "message": "Merge \"Optimize layout rendering in layoutlib\" into klp-dev" }, { "commit": "a955314d905f8567c852226ce4f74994826e8777", "tree": "9f28d9257abea587789103a435e0ec55c83c0d93", "parents": [ "fd8cba3ab83972eefc796fa122b0ec9222078b1c", "58037a4404e639d28695a0f1c17053b53b96b970" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Thu Feb 06 02:05:21 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 06 02:05:21 2014 +0000" }, "message": "Merge \"Add missing files to fix libphonenumber for layoutlib.\" into klp-dev" } ], "next": "fd8cba3ab83972eefc796fa122b0ec9222078b1c" }