)]}' { "log": [ { "commit": "14edfa8f658066a1d59a890a19218167ad6121a4", "tree": "de1721b5ea24c777433b74c1670b578f30cd374b", "parents": [ "d4ab588c1fe61cdd75471d9d5d10af655579744b", "c1a7440094c94f4369f04f062485c9ea1162a78b" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 14 00:40:57 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 14 00:40:57 2014 +0000" }, "message": "am c1a74400: am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build\n\n* commit \u0027c1a7440094c94f4369f04f062485c9ea1162a78b\u0027:\n Fix build\n" }, { "commit": "c1a7440094c94f4369f04f062485c9ea1162a78b", "tree": "7c8be5752debb944e754a2f09f92d380545237c2", "parents": [ "32c5f2998f709819ce82fcea5d9f9072c5dc5626", "7dfe1fdac6f0306e1e31417d58a1a36d4280d2cc" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 14 00:36:20 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 14 00:36:20 2014 +0000" }, "message": "am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build\n\n* commit \u00277dfe1fdac6f0306e1e31417d58a1a36d4280d2cc\u0027:\n Fix build\n" }, { "commit": "7dfe1fdac6f0306e1e31417d58a1a36d4280d2cc", "tree": "903be8cec8423a1e273a4cfd43a2bc5dc4c6de4f", "parents": [ "78b94de4b527c26bb3c038ae4f8cc351b3b4881f", "c289ec6b465648d7d93e6f2dc9ed28822683f7d6" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 14 00:31:15 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 14 00:31:15 2014 +0000" }, "message": "am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build\n\n* commit \u0027c289ec6b465648d7d93e6f2dc9ed28822683f7d6\u0027:\n Fix build\n" }, { "commit": "c289ec6b465648d7d93e6f2dc9ed28822683f7d6", "tree": "0cb3548acfc14db731ce83d7fe3a3da174e90a2f", "parents": [ "96e30774c019e1f4400ac2d7a724ea7328bec1ac", "3a559d56a627687d56dc06cc459ef1e7e6b1cd79" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 14 00:26:38 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 14 00:26:38 2014 +0000" }, "message": "am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build\n\n* commit \u00273a559d56a627687d56dc06cc459ef1e7e6b1cd79\u0027:\n Fix build\n" }, { "commit": "3a559d56a627687d56dc06cc459ef1e7e6b1cd79", "tree": "bdb0dc3b0d8ae9f43805717ddbefe3d74503593a", "parents": [ "fea4b4dde360cf5caa0fe887dbcc51a0a2329e25", "b5b4756565a5f74c6eb2ca7f90ac839a4289daae" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 14 00:21:33 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 14 00:21:33 2014 +0000" }, "message": "am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build\n\n* commit \u0027b5b4756565a5f74c6eb2ca7f90ac839a4289daae\u0027:\n Fix build\n" }, { "commit": "b5b4756565a5f74c6eb2ca7f90ac839a4289daae", "tree": "74cdd243be5e80805e772b56bcf4c9b33e569a8e", "parents": [ "3450dc325670cc8e7855c93193cf6f59cf7be430", "98822f0eba746b4f8c8a622f21c2d32dad08453f" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 14 00:15:24 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 14 00:15:24 2014 +0000" }, "message": "am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build\n\n* commit \u002798822f0eba746b4f8c8a622f21c2d32dad08453f\u0027:\n Fix build\n" }, { "commit": "6e923e1b51c87e7b20a98dfc2fff52ca9115c9d4", "tree": "378d9cf19f3d8a521f0b407709d5b152bd3353d1", "parents": [ "f41a380bd97a25bee1804e43e8deba74fa100163", "90d57721692e45fe6259136296e3cd5b669443fc" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 14 00:05:35 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 14 00:05:35 2014 +0000" }, "message": "am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build\n\n* commit \u002790d57721692e45fe6259136296e3cd5b669443fc\u0027:\n Fix build\n" }, { "commit": "90d57721692e45fe6259136296e3cd5b669443fc", "tree": "3d152388965b87cab9d901e369e198b681268dcd", "parents": [ "d10ca17d6feefd449595df1cb11d161c8f10dd57", "209745a32f0a68584aba57acf7c8d1de633b1cda" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Wed May 14 00:00:05 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 14 00:00:05 2014 +0000" }, "message": "am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build\n\n* commit \u0027209745a32f0a68584aba57acf7c8d1de633b1cda\u0027:\n Fix build\n" }, { "commit": "209745a32f0a68584aba57acf7c8d1de633b1cda", "tree": "17aa7876ba52c984287e1bc8feac43cebed44c5c", "parents": [ "8921409a05c0e52ba453d3c4f37a9506fde9b321", "c251147a2b6f461427b1ce49f7066fadc97c1faf" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 23:55:17 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 23:55:17 2014 +0000" }, "message": "am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build\n\n* commit \u0027c251147a2b6f461427b1ce49f7066fadc97c1faf\u0027:\n Fix build\n" }, { "commit": "85ec144538de6c27b22dff1bd45491a334f626ef", "tree": "82205ba50ce1c77d6ada5b211765e21a631f25ed", "parents": [ "d99dd3e7322fa0071ca709e71ab34ae54677e3dc", "f266873c8059e78410bf43c83fb8f0fd5bfe3362" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 23:45:30 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 23:45:30 2014 +0000" }, "message": "am f266873c: am 1c55797d: Fix build\n\n* commit \u0027f266873c8059e78410bf43c83fb8f0fd5bfe3362\u0027:\n Fix build\n" }, { "commit": "f266873c8059e78410bf43c83fb8f0fd5bfe3362", "tree": "ba13b5155c7acc118d25687146d09871ada0fbb9", "parents": [ "70efbad0648eb96e9becbd0529cc1f34b6ffb986", "1c55797d0e786b6594e769c2fa424e1b8386648e" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 23:40:34 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 23:40:34 2014 +0000" }, "message": "am 1c55797d: Fix build\n\n* commit \u00271c55797d0e786b6594e769c2fa424e1b8386648e\u0027:\n Fix build\n" }, { "commit": "1c55797d0e786b6594e769c2fa424e1b8386648e", "tree": "832f362bc9ae7a12cfc7b045d81f127c81711518", "parents": [ "bd5a3e6510e83b161a0e40c191d349524ae4a8e6" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 15:46:28 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 15:47:04 2014 -0700" }, "message": "Fix build\n\nremove a line that shouldn\u0027t have been merged into this branch.\n\nThe build will still be broken for this branch, but this will fix it for\nmany branches downstream.\n\nChange-Id: I2f556636640eb823dc2834afae7b536e79b79607\n" }, { "commit": "e3950823b6126e16158d3c969c2bdd6d914b22dc", "tree": "918aa76472024fbb17244a131096e2948158dc63", "parents": [ "004bfbd36acff3d16979b4021630d19d1df6d826", "465a99260ea1d868e9aa43d08e63cb85892f188e" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 21:43:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 21:43:52 2014 +0000" }, "message": "am 465a9926: am 21dc46b1: am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev\n\n* commit \u0027465a99260ea1d868e9aa43d08e63cb85892f188e\u0027:\n Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]\n" }, { "commit": "465a99260ea1d868e9aa43d08e63cb85892f188e", "tree": "817a622b3cf3d88327fd948058ef777791eafcf6", "parents": [ "83dcd3f97fd2b48c8a6625fd596bdf577c22f390", "21dc46b14df9456eede9d4eb7082c85bec732058" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 21:37:58 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 21:37:58 2014 +0000" }, "message": "am 21dc46b1: am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev\n\n* commit \u002721dc46b14df9456eede9d4eb7082c85bec732058\u0027:\n Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]\n" }, { "commit": "21dc46b14df9456eede9d4eb7082c85bec732058", "tree": "dad3e58c0a06acb52b0cfab53a0fbd8d24940cba", "parents": [ "bda6d9a15a845611e0d68acbf09787da71532287", "569dc64cd6b0bb7bdfec97967b192d2a706e3f81" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 21:33:07 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 21:33:07 2014 +0000" }, "message": "am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev\n\n* commit \u0027569dc64cd6b0bb7bdfec97967b192d2a706e3f81\u0027:\n Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]\n" }, { "commit": "569dc64cd6b0bb7bdfec97967b192d2a706e3f81", "tree": "82d61b4a2688ffeea6c81c6622e7600930af75eb", "parents": [ "9a3e6ec73c2188eb5bf1406b974dfc34e55722ad", "69ab594625e274ed4ca6d4a1dc7f8fb19d44f020" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 21:28:18 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 21:28:18 2014 +0000" }, "message": "am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev\n\n* commit \u002769ab594625e274ed4ca6d4a1dc7f8fb19d44f020\u0027:\n Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]\n" }, { "commit": "69ab594625e274ed4ca6d4a1dc7f8fb19d44f020", "tree": "b2c0dd8cbc10eef7075cd174a78e612def3257a0", "parents": [ "cdc40eb0e02e5b7abc05a438f7fd51045ec91862", "fcfb8801b27fd40ff27c380b8bad9b9a210effca" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 21:23:47 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 21:23:47 2014 +0000" }, "message": "am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev\n\n* commit \u0027fcfb8801b27fd40ff27c380b8bad9b9a210effca\u0027:\n Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]\n" }, { "commit": "fcfb8801b27fd40ff27c380b8bad9b9a210effca", "tree": "d2a2f757c84965a0d919151442b713f7f2d6a73f", "parents": [ "6fd1703eb96669bb5c985c9de8d08107e800824c", "18b1525ac7666933befd6085461391ad1087b19a" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 21:18:03 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 21:18:03 2014 +0000" }, "message": "am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev\n\n* commit \u002718b1525ac7666933befd6085461391ad1087b19a\u0027:\n Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]\n" }, { "commit": "ef24a5091b63fb512d4ca9eb34df6394c3842d33", "tree": "9f0656aa265f819db9090e2b2cc79f6891744bee", "parents": [ "4dff881b997e3e8c871068ae4b237a9e0f4ab2e7", "900954e3cd135bf43db975961056e7661f26a6c6" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 21:07:40 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 21:07:40 2014 +0000" }, "message": "am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev\n\n* commit \u0027900954e3cd135bf43db975961056e7661f26a6c6\u0027:\n Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]\n" }, { "commit": "900954e3cd135bf43db975961056e7661f26a6c6", "tree": "564f2b4bd26af36a9f21dc9ed687580246c654c3", "parents": [ "7b9cc71063869a98f35b49c2e072750dfa46e0b9", "2100476ace68858bc7b7356b33aa525e38795592" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 21:02:19 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 21:02:19 2014 +0000" }, "message": "am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev\n\n* commit \u00272100476ace68858bc7b7356b33aa525e38795592\u0027:\n Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]\n" }, { "commit": "2100476ace68858bc7b7356b33aa525e38795592", "tree": "f082969243d710a0670c8a8e1f6df455345a040c", "parents": [ "9c7e3064469e51a10503cfdf3d0215a62a3b6c8d", "31a3760a49f7495e73f4de1c11f2e3f64ff9a7ff" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 21:00:19 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 21:00:19 2014 +0000" }, "message": "am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev\n\n* commit \u002731a3760a49f7495e73f4de1c11f2e3f64ff9a7ff\u0027:\n Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]\n" }, { "commit": "964023c5dcd0334cdcf624eff26d791d9c9617a8", "tree": "58a332dfd82f3aea3936e8cad203b9f2f7a8ceb0", "parents": [ "c1847b54a391857f0871a15e97fbaae0fef0ff33", "8bf73eae6c98532c8a597b885b948b9878555441" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 20:54:12 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 20:54:12 2014 +0000" }, "message": "am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev\n\n* commit \u00278bf73eae6c98532c8a597b885b948b9878555441\u0027:\n Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]\n" }, { "commit": "f38000cbd87abb520855c56bbd7118ddbe35a003", "tree": "db443b073f7e74215a8225ab95d61fa62969da95", "parents": [ "e4d29f75f1367bbd27d48aa488bd6deb8ec5258f", "3921e87e6e67a063caa1987937d7944b24aef489" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue May 13 18:39:17 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 13 18:39:17 2014 +0000" }, "message": "Merge \"Quick fix to ensure mipmap doesn\u0027t get stripped by AAPT\"" }, { "commit": "425645c738f200b44d0c9344ec286562a841d155", "tree": "421cae1b515b99d073dba6515da34f6c7433cd02", "parents": [ "3144fde70f16a11a004dc95ca6f6f0f61db57638", "567f948b60e9a647610454745b0629c136d492db" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 18:15:58 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 18:15:58 2014 +0000" }, "message": "am 567f948b: am 872a5a1a: am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev\n\n* commit \u0027567f948b60e9a647610454745b0629c136d492db\u0027:\n Fix CalendarView to show the right labels. [DO NOT MERGE]\n" }, { "commit": "567f948b60e9a647610454745b0629c136d492db", "tree": "d24eb93b4db64ef97840ac995cc82afc0286b4e0", "parents": [ "4472b649f975f2ddf6450bfdfd8fd1eae7a92e46", "872a5a1a93eef53a18d18778104bb8669b4bc073" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 18:01:02 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 18:01:02 2014 +0000" }, "message": "am 872a5a1a: am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev\n\n* commit \u0027872a5a1a93eef53a18d18778104bb8669b4bc073\u0027:\n Fix CalendarView to show the right labels. [DO NOT MERGE]\n" }, { "commit": "70efbad0648eb96e9becbd0529cc1f34b6ffb986", "tree": "7a4dc4d09bd4860ced1707981a6fa8512841e268", "parents": [ "8bf73eae6c98532c8a597b885b948b9878555441", "bd5a3e6510e83b161a0e40c191d349524ae4a8e6" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:58:17 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:58:17 2014 +0000" }, "message": "am bd5a3e65: am 1677a9bd: Merge \"resolve conflicts for merge 5a7b3b65 correctly\" into jb-dev-plus-aosp\n\n* commit \u0027bd5a3e6510e83b161a0e40c191d349524ae4a8e6\u0027:\n resolve conflicts for merge 5a7b3b65 correctly\n" }, { "commit": "8bf73eae6c98532c8a597b885b948b9878555441", "tree": "d8d44a76b049f12fc4f69f6aa141b89f790071fd", "parents": [ "5454be00b182b206bbc9dcd35b88da63631f7e8e", "0ad4f2cedde037c2b09a7f09c5f95f0984267c64" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:58:14 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:58:14 2014 +0000" }, "message": "am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev\n\n* commit \u00270ad4f2cedde037c2b09a7f09c5f95f0984267c64\u0027:\n Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]\n" }, { "commit": "3921e87e6e67a063caa1987937d7944b24aef489", "tree": "270ce25d67ef36d099483df96d65179fcba1d23b", "parents": [ "da86f784b686ba00d9f797b8ee565629669080b9" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue May 13 10:56:25 2014 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue May 13 10:57:53 2014 -0700" }, "message": "Quick fix to ensure mipmap doesn\u0027t get stripped by AAPT\n\nThis is a quick fix. A refactoring is already underway to properly\nsolve this problem.\n\nBug:14857725\nChange-Id: Ic0c475aa0b180803a687904ad9f71eb87e137a25\n" }, { "commit": "872a5a1a93eef53a18d18778104bb8669b4bc073", "tree": "55c0e9f3d64997cdafc20e130ce03f13b03727ab", "parents": [ "7ce3b5ef64b1a183b75279016e6fc4f65be8c933", "01fefec9397569cf9c7c5b599c16126f1b4d6870" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:55:41 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:55:41 2014 +0000" }, "message": "am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev\n\n* commit \u002701fefec9397569cf9c7c5b599c16126f1b4d6870\u0027:\n Fix CalendarView to show the right labels. [DO NOT MERGE]\n" }, { "commit": "bd5a3e6510e83b161a0e40c191d349524ae4a8e6", "tree": "108b74a37137a498820c0aaa7d6d4f9c35186b61", "parents": [ "0ad4f2cedde037c2b09a7f09c5f95f0984267c64", "1677a9bdeba3961625236925e754920fca1b7e89" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:53:55 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:53:55 2014 +0000" }, "message": "am 1677a9bd: Merge \"resolve conflicts for merge 5a7b3b65 correctly\" into jb-dev-plus-aosp\n\n* commit \u00271677a9bdeba3961625236925e754920fca1b7e89\u0027:\n resolve conflicts for merge 5a7b3b65 correctly\n" }, { "commit": "01fefec9397569cf9c7c5b599c16126f1b4d6870", "tree": "8fe0d234dd5b2bb31f7b9460e535a2b5f672eb59", "parents": [ "04c9d1932d8a4c0f646a51ce6674535bd77b6172", "5fc8f945ee6a763b08e47019319432ec71ba1d1a" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:50:45 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:50:45 2014 +0000" }, "message": "am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev\n\n* commit \u00275fc8f945ee6a763b08e47019319432ec71ba1d1a\u0027:\n Fix CalendarView to show the right labels. [DO NOT MERGE]\n" }, { "commit": "5fc8f945ee6a763b08e47019319432ec71ba1d1a", "tree": "1629b381d37037c68755d90861a8b41d13113a58", "parents": [ "3271adea10a7a35d4fe852801794038f01e371be", "b0f2ded5e9e84fb51ec5b2cb6b419b040b008276" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:45:43 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:45:43 2014 +0000" }, "message": "am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev\n\n* commit \u0027b0f2ded5e9e84fb51ec5b2cb6b419b040b008276\u0027:\n Fix CalendarView to show the right labels. [DO NOT MERGE]\n" }, { "commit": "0ad4f2cedde037c2b09a7f09c5f95f0984267c64", "tree": "64ff61592be9775746522821ad4b6f30ea15aaed", "parents": [ "5dae7fda38850a5146a6b8a4edbfd9aa96aea484", "7377c7be6abcb3bccabb6cdf2af0ecfed355606c" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 10:44:24 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 10:44:24 2014 -0700" }, "message": "resolved conflicts for merge of 7377c7be to jb-mr1-dev\n\nChange-Id: I26d2e3478536826608413094e17cd36da43b4e23\n" }, { "commit": "5454be00b182b206bbc9dcd35b88da63631f7e8e", "tree": "849964c35a5e1c73e5178429362db0e5a36a2abc", "parents": [ "d388afada25c950f87fa285ccfeb1c3343454762", "5dae7fda38850a5146a6b8a4edbfd9aa96aea484" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:42:09 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:42:09 2014 +0000" }, "message": "am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]\n\n* commit \u00275dae7fda38850a5146a6b8a4edbfd9aa96aea484\u0027:\n Support actionProviderClass attribute for menus [DO NOT MERGE]\n" }, { "commit": "d388afada25c950f87fa285ccfeb1c3343454762", "tree": "d2ff537bf114e280abc7ac5b9bf559a359afb657", "parents": [ "ebd909cca1f69028878f15e6fb0ece6e8c8da584", "b6de60e0020dbed906b1d275de17f8c615b2b242" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:42:06 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:42:06 2014 +0000" }, "message": "am b6de60e0: am df2da3d7: am 7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE]\n\n* commit \u0027b6de60e0020dbed906b1d275de17f8c615b2b242\u0027:\n Add special system view cookie to OverflowButton. [DO NOT MERGE]\n" }, { "commit": "b161d6ba7f85b49e4e19d69bd107d30cdd3c0bc1", "tree": "202ab614d811c9d4850e4653ac024c17cf753170", "parents": [ "cc9e359699e9464ac8a8d6bbd4f12c23a0009d3c", "673d9734c2d9b62ecd41dcac3c730d242952989e" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:42:00 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:42:00 2014 +0000" }, "message": "am 673d9734: resolved conflicts for merge of 00d09649 to jb-mr1-dev\n\n* commit \u0027673d9734c2d9b62ecd41dcac3c730d242952989e\u0027:\n Fix style warnings in RenderSessionImpl [DO NOT MERGE]\n" }, { "commit": "5dae7fda38850a5146a6b8a4edbfd9aa96aea484", "tree": "2ff0aa711df76a2b006bd200b408ce1754ac106f", "parents": [ "b6de60e0020dbed906b1d275de17f8c615b2b242", "9359dc2e7d6bc671af3fee0c1dc540dd3685365c" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:40:55 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:40:55 2014 +0000" }, "message": "am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]\n\n* commit \u00279359dc2e7d6bc671af3fee0c1dc540dd3685365c\u0027:\n Support actionProviderClass attribute for menus [DO NOT MERGE]\n" }, { "commit": "b6de60e0020dbed906b1d275de17f8c615b2b242", "tree": "d88cb1ae38ffe88a52664e2fa7ae422039f5eff2", "parents": [ "ae5e0c7b9f24564547d38a77641b120d6685dd5a", "df2da3d7c9f82ff2304f630f4ff9fc2cb3001c6f" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:40:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:40:52 2014 +0000" }, "message": "am df2da3d7: am 7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE]\n\n* commit \u0027df2da3d7c9f82ff2304f630f4ff9fc2cb3001c6f\u0027:\n Add special system view cookie to OverflowButton. [DO NOT MERGE]\n" }, { "commit": "b0f2ded5e9e84fb51ec5b2cb6b419b040b008276", "tree": "22561947d0d13aef1956e26547711de6cce4fa7b", "parents": [ "6b0c427670606abf5539789299042dc04c67703e", "40db4a13bc8389dd94cac2fd4c896e10b46c2499" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:39:14 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:39:14 2014 +0000" }, "message": "am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev\n\n* commit \u002740db4a13bc8389dd94cac2fd4c896e10b46c2499\u0027:\n Fix CalendarView to show the right labels. [DO NOT MERGE]\n" }, { "commit": "9ddb073bf72d9ca587ecc626dcc9721dd33447c9", "tree": "80a3b4c13ba476ff76c868ae4d709c3280b7422d", "parents": [ "5974d229f9af39df149c8b0c4081826f9a65ce8c", "c70ce72a986f029c9f8c43b4060001624176068d" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:29:13 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:29:13 2014 +0000" }, "message": "am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev\n\n* commit \u0027c70ce72a986f029c9f8c43b4060001624176068d\u0027:\n Fix CalendarView to show the right labels. [DO NOT MERGE]\n" }, { "commit": "c70ce72a986f029c9f8c43b4060001624176068d", "tree": "2e9d60ea3e493395559cbfc541151c31b9077c53", "parents": [ "0cbfde12fde85713f87d8c5ac0cc137c143dfd27", "af9fde9680922f072981a4853e37ccfcf974920a" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:24:10 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:24:10 2014 +0000" }, "message": "am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev\n\n* commit \u0027af9fde9680922f072981a4853e37ccfcf974920a\u0027:\n Fix CalendarView to show the right labels. [DO NOT MERGE]\n" }, { "commit": "af9fde9680922f072981a4853e37ccfcf974920a", "tree": "3b40011469d381fb81770104918e067cf41bb89f", "parents": [ "40b54563743c3bab92ee7086f8a2b159ecef5453", "425addb94428d6f17658256a4acd4b62189c8844" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:18:55 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:18:55 2014 +0000" }, "message": "am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev\n\n* commit \u0027425addb94428d6f17658256a4acd4b62189c8844\u0027:\n Fix CalendarView to show the right labels. [DO NOT MERGE]\n" }, { "commit": "673d9734c2d9b62ecd41dcac3c730d242952989e", "tree": "cb66515360ae3ed3708868c2148cac7df6908d2b", "parents": [ "5280c911d81a7db5ec8854850bef60d8b0951358", "00d096490189dadfc5e2a1e129d8b524d90da247" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 10:17:09 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 10:17:09 2014 -0700" }, "message": "resolved conflicts for merge of 00d09649 to jb-mr1-dev\n\nChange-Id: Ib3c34a1989d4251c3ac4755c52fe05a81644930a\n" }, { "commit": "cc9e359699e9464ac8a8d6bbd4f12c23a0009d3c", "tree": "135bb6a55060169f2fe44a14bcd8010bd97ba6ae", "parents": [ "7ef276450f3157cc68f714b0d5805319e6f4c555", "5280c911d81a7db5ec8854850bef60d8b0951358" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:14:17 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:14:17 2014 +0000" }, "message": "am 5280c911: am 0df5ae65: am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE]\n\n* commit \u00275280c911d81a7db5ec8854850bef60d8b0951358\u0027:\n Add view cookies for action bar menus. [DO NOT MERGE]\n" }, { "commit": "9978c0363e7db4002d4c86d225cd6b1437bca1fc", "tree": "6ff658e372c45dee0db24851bedfece394ec5382", "parents": [ "8e015b7ba46b18a4a0741be7d64f389433c79230", "1867f58d6ceebac899b60b029e34f3a1fcabba7f" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:14:12 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:14:12 2014 +0000" }, "message": "am 1867f58d: am 3027b69e: am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]\n\n* commit \u00271867f58d6ceebac899b60b029e34f3a1fcabba7f\u0027:\n Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]\n" }, { "commit": "8e015b7ba46b18a4a0741be7d64f389433c79230", "tree": "169eeaeaae71f8c9c997c77040aad5d98978dff7", "parents": [ "0f26b5102574f0a989023485f4d63a9ac50107d2", "a5461ebfaebf3337a0cf1c752334f23de145a6d1" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:14:09 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:14:09 2014 +0000" }, "message": "am a5461ebf: resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev\n\n* commit \u0027a5461ebfaebf3337a0cf1c752334f23de145a6d1\u0027:\n Action bar rendering in layoutlib [DO NOT MERGE]\n" }, { "commit": "5280c911d81a7db5ec8854850bef60d8b0951358", "tree": "482b9305e61b1e1c5b52380ab32cfc842d568226", "parents": [ "f192096a137ea0a789b2adca2111742beccb4533", "0df5ae65a91174c99d1af633b45b3a1a7861cd1c" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:11:26 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:11:26 2014 +0000" }, "message": "am 0df5ae65: am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE]\n\n* commit \u00270df5ae65a91174c99d1af633b45b3a1a7861cd1c\u0027:\n Add view cookies for action bar menus. [DO NOT MERGE]\n" }, { "commit": "1867f58d6ceebac899b60b029e34f3a1fcabba7f", "tree": "29ef257110718d01537ddff867bc6510d13d3bf5", "parents": [ "a5461ebfaebf3337a0cf1c752334f23de145a6d1", "3027b69e154cffc6e286caf90b0f9af01c473c14" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 17:11:20 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 17:11:20 2014 +0000" }, "message": "am 3027b69e: am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]\n\n* commit \u00273027b69e154cffc6e286caf90b0f9af01c473c14\u0027:\n Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]\n" }, { "commit": "a43aaf00b583e8a88681cdcc6ebe1ae2c52f6f20", "tree": "164d3fdc2fa10acd8dac0fc46956aad712ab07cc", "parents": [ "888461c801b531f31b2ef34617d333d781d93010", "9c00e6739c3d0a11a714a0f654b893531b0f1c5d" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 09:49:18 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 09:49:18 2014 -0700" }, "message": "resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev\n\nChange-Id: I4ab1b0a71b99692458efc3a67c8a8da3690afb7b\n" }, { "commit": "a5461ebfaebf3337a0cf1c752334f23de145a6d1", "tree": "782c3d3179416b3ef5f3743b2e07477dcd402220", "parents": [ "9053261a5413f401168d25fa4a9749723b232949", "6d3c4ab2456a30c5517f4ad6fb8df8d64c517beb" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 09:40:35 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 09:40:35 2014 -0700" }, "message": "resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev\n\nChange-Id: I5c4634897882deb663f32d8148202d7c9189521d\n" }, { "commit": "0f26b5102574f0a989023485f4d63a9ac50107d2", "tree": "e3a997e34fc97841d0c7b39c5587b360623329c1", "parents": [ "727ad35081570c30f9b9ecde84d309a82b653856", "9053261a5413f401168d25fa4a9749723b232949" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:36:56 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:36:56 2014 +0000" }, "message": "am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n\n* commit \u00279053261a5413f401168d25fa4a9749723b232949\u0027:\n Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n" }, { "commit": "727ad35081570c30f9b9ecde84d309a82b653856", "tree": "131aae5cc2edf122d3939447765ca1ca061122e0", "parents": [ "627cab1257bbd80e74ad5db1963aeedbe056b462", "5594616c4f4513dc97b08d6cabb6fd7127dde131" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:36:53 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:36:53 2014 +0000" }, "message": "am 5594616c: am 9602fc1c: am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n\n* commit \u00275594616c4f4513dc97b08d6cabb6fd7127dde131\u0027:\n Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n" }, { "commit": "627cab1257bbd80e74ad5db1963aeedbe056b462", "tree": "3fa2489d91bfd685738d21fc175bb75f70f9f376", "parents": [ "effef17297dffc05511597ccc0f437deb278647f", "45693e50ecdae9b456e4974dd91758f9e25df2b4" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:36:50 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:36:50 2014 +0000" }, "message": "am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]\n\n* commit \u002745693e50ecdae9b456e4974dd91758f9e25df2b4\u0027:\n Layoutlib tests now check methods return value [DO NOT MERGE]\n" }, { "commit": "effef17297dffc05511597ccc0f437deb278647f", "tree": "c930914c74cfa9090108c748aeffd414c46ddca3", "parents": [ "c3a0c9f679cf18a512ca194e14a74dde852af831", "e3b43270e87fd85a6281c91f2897233aac6b6397" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:36:48 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:36:48 2014 +0000" }, "message": "am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]\n\n* commit \u0027e3b43270e87fd85a6281c91f2897233aac6b6397\u0027:\n Set default text style in layoutlib as NORMAL [DO NOT MERGE]\n" }, { "commit": "c3a0c9f679cf18a512ca194e14a74dde852af831", "tree": "f665fd005962502b35ea2b56911eccdf2ca69851", "parents": [ "835cbaa192f324ec14361afc700cc44a6bfa47b7", "45ca5ba7dc3b70dd39991217894eed114eefb1b8" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:36:45 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:36:45 2014 +0000" }, "message": "am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]\n\n* commit \u002745ca5ba7dc3b70dd39991217894eed114eefb1b8\u0027:\n Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]\n" }, { "commit": "835cbaa192f324ec14361afc700cc44a6bfa47b7", "tree": "1a372504bf5cb5bac72af587b0cb3c311137e63a", "parents": [ "ce9e87f7436ab6506b5a2949930ce00cd0bc65f5", "9f9652587dd08e5a4f7c8195eb904cd0f0c3f6c4" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:36:42 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:36:42 2014 +0000" }, "message": "am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]\n\n* commit \u00279f9652587dd08e5a4f7c8195eb904cd0f0c3f6c4\u0027:\n Fix a bug in Nine Patch library. [DO NOT MERGE]\n" }, { "commit": "ce9e87f7436ab6506b5a2949930ce00cd0bc65f5", "tree": "48651980f430ced12837bbfa7729a3a87509e58d", "parents": [ "8a4f39351f5784c81501462fc84d6fe199bdedca", "8c5c2410ae9df60d9462784370965a0417e06fa4" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:36:39 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:36:39 2014 +0000" }, "message": "am 8c5c2410: am 7bb8de58: am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]\n\n* commit \u00278c5c2410ae9df60d9462784370965a0417e06fa4\u0027:\n Optimize layout rendering in layoutlib [DO NOT MERGE]\n" }, { "commit": "8a4f39351f5784c81501462fc84d6fe199bdedca", "tree": "6539e12fcaf80fb9b1c3f8a691993611c7c24be3", "parents": [ "838e54826bbb03cec41684340c63be993d2dc160", "48bf7b49bb361a4084e5fb4c6d0ae497a606c700" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:36:36 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:36:36 2014 +0000" }, "message": "am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]\n\n* commit \u002748bf7b49bb361a4084e5fb4c6d0ae497a606c700\u0027:\n Add methods for Time_Delegate [DO NOT MERGE]\n" }, { "commit": "838e54826bbb03cec41684340c63be993d2dc160", "tree": "777448e8241a37cddd8594bcd49ab5727add5bcf", "parents": [ "df8a15b31ec4c72042f80a90365867939bddffd1", "94d33cfce1f32af4480f941fdd6c9942bb203d2c" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:36:33 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:36:33 2014 +0000" }, "message": "am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]\n\n* commit \u002794d33cfce1f32af4480f941fdd6c9942bb203d2c\u0027:\n Fix NPE in layoutlib. [DO NOT MERGE]\n" }, { "commit": "df8a15b31ec4c72042f80a90365867939bddffd1", "tree": "be5fcb2c89a3b9d5060d49e9d3560f1eedb49927", "parents": [ "5f61e9b4ef31274f64965cf676757c84b368a2f1", "d4e6727d02f7507fdfd6cbbabd03d6e922127e4b" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:36:30 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:36:30 2014 +0000" }, "message": "am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]\n\n* commit \u0027d4e6727d02f7507fdfd6cbbabd03d6e922127e4b\u0027:\n Fix text size in Fake Action Bar. [DO NOT MERGE]\n" }, { "commit": "5f61e9b4ef31274f64965cf676757c84b368a2f1", "tree": "b6bdf7cbb760f851d357999cdd6661a6d2bbe586", "parents": [ "520f585bc6409b5c0024105a46b282245dad42e0", "ed98abecad359ab1765ac1f698c8ba06dbd00745" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:36:28 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:36:28 2014 +0000" }, "message": "am ed98abec: am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp\n\n* commit \u0027ed98abecad359ab1765ac1f698c8ba06dbd00745\u0027:\n Remove references to non-std Java classes. [DO NOT MERGE]\n" }, { "commit": "520f585bc6409b5c0024105a46b282245dad42e0", "tree": "619f9833df5258cb008a66dd31e5534de884028b", "parents": [ "2c167d0f6a370f9272ef24746222772586c1758c", "2cbe100a9bc6d2b3bf828432a1527f0ac239e575" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:36:25 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:36:25 2014 +0000" }, "message": "am 2cbe100a: am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]\n\n* commit \u00272cbe100a9bc6d2b3bf828432a1527f0ac239e575\u0027:\n Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]\n" }, { "commit": "2c167d0f6a370f9272ef24746222772586c1758c", "tree": "b848deecfeee7c3272b18b5caa6ba15b2128ce94", "parents": [ "9c00e6739c3d0a11a714a0f654b893531b0f1c5d", "632c9e2dabc44b24f04c3418e4a3540b22db792b" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:36:22 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:36:22 2014 +0000" }, "message": "am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]\n\n* commit \u0027632c9e2dabc44b24f04c3418e4a3540b22db792b\u0027:\n Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]\n" }, { "commit": "9053261a5413f401168d25fa4a9749723b232949", "tree": "638872007433cb85636a63967ee0ab7b2a33212d", "parents": [ "5594616c4f4513dc97b08d6cabb6fd7127dde131", "052e0c589e5cf714ca71bc8d7b3ce8b3f6c4cb96" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:32:02 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:32:02 2014 +0000" }, "message": "am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n\n* commit \u0027052e0c589e5cf714ca71bc8d7b3ce8b3f6c4cb96\u0027:\n Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n" }, { "commit": "5594616c4f4513dc97b08d6cabb6fd7127dde131", "tree": "dc083559200ed506e13c56a41400952d6924ff1e", "parents": [ "45693e50ecdae9b456e4974dd91758f9e25df2b4", "9602fc1c00e5e5cdf26cdc3fe22022ffcd115361" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:31:59 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:31:59 2014 +0000" }, "message": "am 9602fc1c: am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n\n* commit \u00279602fc1c00e5e5cdf26cdc3fe22022ffcd115361\u0027:\n Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n" }, { "commit": "45693e50ecdae9b456e4974dd91758f9e25df2b4", "tree": "5c879b2b23ad900d56f886574a54550f0bc224d8", "parents": [ "e3b43270e87fd85a6281c91f2897233aac6b6397", "c9a4badb54320f8c52d2da06a762b5e6eef00ee0" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:31:53 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:31:53 2014 +0000" }, "message": "am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]\n\n* commit \u0027c9a4badb54320f8c52d2da06a762b5e6eef00ee0\u0027:\n Layoutlib tests now check methods return value [DO NOT MERGE]\n" }, { "commit": "e3b43270e87fd85a6281c91f2897233aac6b6397", "tree": "5931fda3de15783410616324d00960555306481b", "parents": [ "45ca5ba7dc3b70dd39991217894eed114eefb1b8", "bdd8fbf6eae886dc3b2cd716745ede918773a2c4" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:31:50 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:31:50 2014 +0000" }, "message": "am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]\n\n* commit \u0027bdd8fbf6eae886dc3b2cd716745ede918773a2c4\u0027:\n Set default text style in layoutlib as NORMAL [DO NOT MERGE]\n" }, { "commit": "45ca5ba7dc3b70dd39991217894eed114eefb1b8", "tree": "23bd68b348d6e143b4dbf27c43fde5fde70abd14", "parents": [ "9f9652587dd08e5a4f7c8195eb904cd0f0c3f6c4", "01cdd3123f408dc41a2bd4786f3a943157ab6c69" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:31:47 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:31:47 2014 +0000" }, "message": "am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]\n\n* commit \u002701cdd3123f408dc41a2bd4786f3a943157ab6c69\u0027:\n Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]\n" }, { "commit": "9f9652587dd08e5a4f7c8195eb904cd0f0c3f6c4", "tree": "44970e2e19675892c63598268fc03e0773e04d05", "parents": [ "8c5c2410ae9df60d9462784370965a0417e06fa4", "d094742d2e19371291409886bb80f070df099533" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:31:44 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:31:44 2014 +0000" }, "message": "am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]\n\n* commit \u0027d094742d2e19371291409886bb80f070df099533\u0027:\n Fix a bug in Nine Patch library. [DO NOT MERGE]\n" }, { "commit": "8c5c2410ae9df60d9462784370965a0417e06fa4", "tree": "14facb33ff5d6f12b7e2f8f0d305637ceac89847", "parents": [ "48bf7b49bb361a4084e5fb4c6d0ae497a606c700", "7bb8de580a451621480913d7839fd7eb784ab689" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:31:41 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:31:41 2014 +0000" }, "message": "am 7bb8de58: am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]\n\n* commit \u00277bb8de580a451621480913d7839fd7eb784ab689\u0027:\n Optimize layout rendering in layoutlib [DO NOT MERGE]\n" }, { "commit": "48bf7b49bb361a4084e5fb4c6d0ae497a606c700", "tree": "fbcf8e613416dc4ee49e326a97b0e13776cba780", "parents": [ "94d33cfce1f32af4480f941fdd6c9942bb203d2c", "69b3115e1c02f2b22165b93bd9bcc5c90ec69b12" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:31:38 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:31:38 2014 +0000" }, "message": "am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]\n\n* commit \u002769b3115e1c02f2b22165b93bd9bcc5c90ec69b12\u0027:\n Add methods for Time_Delegate [DO NOT MERGE]\n" }, { "commit": "94d33cfce1f32af4480f941fdd6c9942bb203d2c", "tree": "4dd5a4425b51b58a02adfa03d6b6160197439051", "parents": [ "d4e6727d02f7507fdfd6cbbabd03d6e922127e4b", "82d5bd98b77a9955e375b075e262639625c40232" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:31:35 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:31:35 2014 +0000" }, "message": "am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]\n\n* commit \u002782d5bd98b77a9955e375b075e262639625c40232\u0027:\n Fix NPE in layoutlib. [DO NOT MERGE]\n" }, { "commit": "d4e6727d02f7507fdfd6cbbabd03d6e922127e4b", "tree": "f5d552589480c6ee8a56f95649d66248f910ecea", "parents": [ "ed98abecad359ab1765ac1f698c8ba06dbd00745", "d5de1bd6305dc8885027504996602755b1e79099" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:31:31 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:31:31 2014 +0000" }, "message": "am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]\n\n* commit \u0027d5de1bd6305dc8885027504996602755b1e79099\u0027:\n Fix text size in Fake Action Bar. [DO NOT MERGE]\n" }, { "commit": "ed98abecad359ab1765ac1f698c8ba06dbd00745", "tree": "14fdb73afd336b58ab0d1fc79c5207146ec2eb2b", "parents": [ "2cbe100a9bc6d2b3bf828432a1527f0ac239e575", "8a70bcef5a724906e3c35c58cb2266ee9c9e1b78" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:31:28 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:31:28 2014 +0000" }, "message": "am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp\n\n* commit \u00278a70bcef5a724906e3c35c58cb2266ee9c9e1b78\u0027:\n Remove references to non-std Java classes. [DO NOT MERGE]\n" }, { "commit": "2cbe100a9bc6d2b3bf828432a1527f0ac239e575", "tree": "17449d141f7babd4b28fa342fe13e518f3a27b24", "parents": [ "632c9e2dabc44b24f04c3418e4a3540b22db792b", "40fea8b1bf689933e63941b5fa5e3379f82c88b5" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:31:23 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:31:23 2014 +0000" }, "message": "am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]\n\n* commit \u002740fea8b1bf689933e63941b5fa5e3379f82c88b5\u0027:\n Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]\n" }, { "commit": "632c9e2dabc44b24f04c3418e4a3540b22db792b", "tree": "730bc47d53da987519016ce0bc5d5cf3466b79b5", "parents": [ "2fb139e02c1e9d2d7c92acf813445a063e73d94f", "065ce2e8b3e11ff8bb1699748edbd23d272bc8a6" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:31:20 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:31:20 2014 +0000" }, "message": "am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]\n\n* commit \u0027065ce2e8b3e11ff8bb1699748edbd23d272bc8a6\u0027:\n Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]\n" }, { "commit": "9c00e6739c3d0a11a714a0f654b893531b0f1c5d", "tree": "73f9dd29691004bc36ce190c91c8487de109b53b", "parents": [ "1103ece28c695fc26fcee812870c553dca8d840d", "2fb139e02c1e9d2d7c92acf813445a063e73d94f" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 16:31:05 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 16:31:05 2014 +0000" }, "message": "am 2fb139e0: resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev\n\n* commit \u00272fb139e02c1e9d2d7c92acf813445a063e73d94f\u0027:\n Fix CalendarView to show the right labels. [DO NOT MERGE]\n" }, { "commit": "1677a9bdeba3961625236925e754920fca1b7e89", "tree": "0a7bf884bd82cf61ba77199a0aac6b633716d8c6", "parents": [ "7377c7be6abcb3bccabb6cdf2af0ecfed355606c", "51cce0ec42a04f94569e8da544b02c888b82b31d" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:32:30 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 13 02:32:31 2014 +0000" }, "message": "Merge \"resolve conflicts for merge 5a7b3b65 correctly\" into jb-dev-plus-aosp" }, { "commit": "51cce0ec42a04f94569e8da544b02c888b82b31d", "tree": "e9c3761ff25df2b3789075d7d81f010c25f3be10", "parents": [ "8a70bcef5a724906e3c35c58cb2266ee9c9e1b78" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon May 12 19:31:25 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon May 12 19:31:25 2014 -0700" }, "message": "resolve conflicts for merge 5a7b3b65 correctly\n\nChange-Id: I832b7ee50002bcd1429bf431cc91f12e60d19f84\n" }, { "commit": "7377c7be6abcb3bccabb6cdf2af0ecfed355606c", "tree": "d1aa739fb16c96e059784687f77733b09ed381f5", "parents": [ "9359dc2e7d6bc671af3fee0c1dc540dd3685365c", "3a115628236ee9051518d4f96840cbb76070cf92" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:20:58 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:20:58 2014 +0000" }, "message": "am 3a115628: Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]\n\n* commit \u00273a115628236ee9051518d4f96840cbb76070cf92\u0027:\n Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]\n" }, { "commit": "9359dc2e7d6bc671af3fee0c1dc540dd3685365c", "tree": "170b9ef899158be52cc6f9f7eab5332a8f5484a8", "parents": [ "df2da3d7c9f82ff2304f630f4ff9fc2cb3001c6f", "2d3fa7ba782238afb891db38e29ef7ec755bfdf6" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:20:54 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:20:54 2014 +0000" }, "message": "am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]\n\n* commit \u00272d3fa7ba782238afb891db38e29ef7ec755bfdf6\u0027:\n Support actionProviderClass attribute for menus [DO NOT MERGE]\n" }, { "commit": "df2da3d7c9f82ff2304f630f4ff9fc2cb3001c6f", "tree": "2ef9039f147820ccee9ccfe48dde02053908e32d", "parents": [ "4eab4e14c8453a0b41923c714a05dccdd72d7829", "7bc363ba72d4cdd9a0b3b1601e432acfc09c0dc0" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:20:51 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:20:51 2014 +0000" }, "message": "am 7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE]\n\n* commit \u00277bc363ba72d4cdd9a0b3b1601e432acfc09c0dc0\u0027:\n Add special system view cookie to OverflowButton. [DO NOT MERGE]\n" }, { "commit": "00d096490189dadfc5e2a1e129d8b524d90da247", "tree": "e2cf935d701a187a1c6bc1c2454d4aec9a418053", "parents": [ "0df5ae65a91174c99d1af633b45b3a1a7861cd1c", "85f53c3335daf0e55cec757fd66fe560e0b020ef" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:20:44 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:20:44 2014 +0000" }, "message": "am 85f53c33: Fix style warnings in RenderSessionImpl [DO NOT MERGE]\n\n* commit \u002785f53c3335daf0e55cec757fd66fe560e0b020ef\u0027:\n Fix style warnings in RenderSessionImpl [DO NOT MERGE]\n" }, { "commit": "0df5ae65a91174c99d1af633b45b3a1a7861cd1c", "tree": "54411e8b9159957421c80955cb29ca1d00a2c70f", "parents": [ "175851600c7757c73f91d1be0f960de157228b1c", "0f209967bfc4a6f1eec46cc34a39cfe8af9f8af9" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:20:42 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:20:42 2014 +0000" }, "message": "am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE]\n\n* commit \u00270f209967bfc4a6f1eec46cc34a39cfe8af9f8af9\u0027:\n Add view cookies for action bar menus. [DO NOT MERGE]\n" }, { "commit": "3027b69e154cffc6e286caf90b0f9af01c473c14", "tree": "354832e4ec96d1faa164cbd40336ea4b5ddeca26", "parents": [ "6d3c4ab2456a30c5517f4ad6fb8df8d64c517beb", "f7e5794990831df87d4097126f6d24455da50efe" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:20:35 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:20:35 2014 +0000" }, "message": "am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]\n\n* commit \u0027f7e5794990831df87d4097126f6d24455da50efe\u0027:\n Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]\n" }, { "commit": "6d3c4ab2456a30c5517f4ad6fb8df8d64c517beb", "tree": "aace13b85ee8e5dcd4aa23b5bde392a8b8be3abc", "parents": [ "052e0c589e5cf714ca71bc8d7b3ce8b3f6c4cb96", "43b15371f9f1da7d97fe0500eb1536d981097e31" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:20:23 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:20:23 2014 +0000" }, "message": "am 43b15371: Action bar rendering in layoutlib [DO NOT MERGE]\n\n* commit \u002743b15371f9f1da7d97fe0500eb1536d981097e31\u0027:\n Action bar rendering in layoutlib [DO NOT MERGE]\n" }, { "commit": "052e0c589e5cf714ca71bc8d7b3ce8b3f6c4cb96", "tree": "3ce7eff241abdefe40d302f9de0a917f2e17db90", "parents": [ "9602fc1c00e5e5cdf26cdc3fe22022ffcd115361", "770e40f839f059e1e3a15a2b14157c7cbb3b0553" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:20:20 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:20:20 2014 +0000" }, "message": "am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n\n* commit \u0027770e40f839f059e1e3a15a2b14157c7cbb3b0553\u0027:\n Fix theme/style resolution in Layoutlib [DO NOT MERGE]\n" }, { "commit": "9602fc1c00e5e5cdf26cdc3fe22022ffcd115361", "tree": "1c4d72574786e0457914360d47cf93257d66641b", "parents": [ "c9a4badb54320f8c52d2da06a762b5e6eef00ee0", "87665388466812897e888680c0b2a1d7db1b9cbd" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:20:16 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:20:16 2014 +0000" }, "message": "am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n\n* commit \u002787665388466812897e888680c0b2a1d7db1b9cbd\u0027:\n Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]\n" }, { "commit": "c9a4badb54320f8c52d2da06a762b5e6eef00ee0", "tree": "cfbb8bbb9f678dde1c9a37728f94a197721d172b", "parents": [ "bdd8fbf6eae886dc3b2cd716745ede918773a2c4", "d915dcac365b6d3ad88afab52e74ccca7dfbefec" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:20:13 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:20:13 2014 +0000" }, "message": "am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]\n\n* commit \u0027d915dcac365b6d3ad88afab52e74ccca7dfbefec\u0027:\n Layoutlib tests now check methods return value [DO NOT MERGE]\n" }, { "commit": "bdd8fbf6eae886dc3b2cd716745ede918773a2c4", "tree": "b2253029638ca058b5b634805443d7d6ec5871b3", "parents": [ "01cdd3123f408dc41a2bd4786f3a943157ab6c69", "877ae53586c3f7f5b788a40dfb0a58bef54a7446" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:20:10 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:20:10 2014 +0000" }, "message": "am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]\n\n* commit \u0027877ae53586c3f7f5b788a40dfb0a58bef54a7446\u0027:\n Set default text style in layoutlib as NORMAL [DO NOT MERGE]\n" }, { "commit": "01cdd3123f408dc41a2bd4786f3a943157ab6c69", "tree": "9849bd626d384312f0b4b5e1da0b4f305e2905a9", "parents": [ "d094742d2e19371291409886bb80f070df099533", "669792b303b99a003bbcbf8d962f5be1debf9b63" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:20:07 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:20:07 2014 +0000" }, "message": "am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]\n\n* commit \u0027669792b303b99a003bbcbf8d962f5be1debf9b63\u0027:\n Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]\n" }, { "commit": "d094742d2e19371291409886bb80f070df099533", "tree": "b2b599560d23bea98ec2c87eab06eb24fe3bf043", "parents": [ "7bb8de580a451621480913d7839fd7eb784ab689", "cda89ca02548c19250ae55671c055536b64b74f8" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:19:59 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:19:59 2014 +0000" }, "message": "am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]\n\n* commit \u0027cda89ca02548c19250ae55671c055536b64b74f8\u0027:\n Fix a bug in Nine Patch library. [DO NOT MERGE]\n" }, { "commit": "7bb8de580a451621480913d7839fd7eb784ab689", "tree": "aab26e63f31bd94a3c5878a7304db2f2257bbcd6", "parents": [ "69b3115e1c02f2b22165b93bd9bcc5c90ec69b12", "a2b34c96f1ef24d96854d1e23426dec7774510e8" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:19:56 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:19:56 2014 +0000" }, "message": "am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]\n\n* commit \u0027a2b34c96f1ef24d96854d1e23426dec7774510e8\u0027:\n Optimize layout rendering in layoutlib [DO NOT MERGE]\n" }, { "commit": "69b3115e1c02f2b22165b93bd9bcc5c90ec69b12", "tree": "3d673806a4fdbae13801a8ef1ccf44472fa5977a", "parents": [ "82d5bd98b77a9955e375b075e262639625c40232", "e183855c1eb7baf750c67bb20e70fb887eba7af6" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:19:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:19:52 2014 +0000" }, "message": "am e183855c: Add methods for Time_Delegate [DO NOT MERGE]\n\n* commit \u0027e183855c1eb7baf750c67bb20e70fb887eba7af6\u0027:\n Add methods for Time_Delegate [DO NOT MERGE]\n" }, { "commit": "82d5bd98b77a9955e375b075e262639625c40232", "tree": "5c262c3b83f090a2a1c2e9d90af963b5386bb69b", "parents": [ "d5de1bd6305dc8885027504996602755b1e79099", "e5a2347bc6cf1506799136af4c9724275ca0247e" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:19:49 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:19:49 2014 +0000" }, "message": "am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]\n\n* commit \u0027e5a2347bc6cf1506799136af4c9724275ca0247e\u0027:\n Fix NPE in layoutlib. [DO NOT MERGE]\n" }, { "commit": "d5de1bd6305dc8885027504996602755b1e79099", "tree": "dbb9cb4c3f5831d865ee01c7ae3b5914af90a132", "parents": [ "8a70bcef5a724906e3c35c58cb2266ee9c9e1b78", "30505abeb6cda9d042ec41f2563d561714eac46b" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:19:46 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:19:46 2014 +0000" }, "message": "am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]\n\n* commit \u002730505abeb6cda9d042ec41f2563d561714eac46b\u0027:\n Fix text size in Fake Action Bar. [DO NOT MERGE]\n" }, { "commit": "1103ece28c695fc26fcee812870c553dca8d840d", "tree": "b683a93bce9bfc8ac1b46299fb7fc9f36d64169a", "parents": [ "42556c394b1f7bf53f59aa6905dc0d20fe495389", "f20c9c660edcce0fe90ba5f8464f726dcd51229e" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:02:56 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:02:56 2014 +0000" }, "message": "am f20c9c66: am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE]\n\n* commit \u0027f20c9c660edcce0fe90ba5f8464f726dcd51229e\u0027:\n Fix layoutlib [DO NOT MERGE]\n" }, { "commit": "42556c394b1f7bf53f59aa6905dc0d20fe495389", "tree": "fb123650307fac8a75b595e3690a41139298ca48", "parents": [ "202800b12d7bbfd719da1c5fa50f646188312e97", "3990ec3490cc43a2690163f2a973b5ac6c4bdc46" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:02:54 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:02:54 2014 +0000" }, "message": "am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]\n\n* commit \u00273990ec3490cc43a2690163f2a973b5ac6c4bdc46\u0027:\n Fix ClassCastException when rendering ListView [DO NOT MERGE]\n" }, { "commit": "202800b12d7bbfd719da1c5fa50f646188312e97", "tree": "d9622469dde625e012aef253683739e1c2c5f077", "parents": [ "4a62a6dce9a4b48f1c1c64e47a22d2319b852acd", "4d69ca223b268d4ed93baf9d3c354e1df79d55ce" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Tue May 13 02:02:50 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 13 02:02:50 2014 +0000" }, "message": "am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]\n\n* commit \u00274d69ca223b268d4ed93baf9d3c354e1df79d55ce\u0027:\n Add orientation to configuration for layoutlib. [DO NOT MERGE]\n" }, { "commit": "2fb139e02c1e9d2d7c92acf813445a063e73d94f", "tree": "e781df18468b5468a781415fa1546c9b54ec6d33", "parents": [ "f20c9c660edcce0fe90ba5f8464f726dcd51229e", "9f2f5e776aed6bfcd87be0b7dd6aa9d22af28817" ], "author": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon May 12 19:01:41 2014 -0700" }, "committer": { "name": "Deepanshu Gupta", "email": "deepanshu@google.com", "time": "Mon May 12 19:01:41 2014 -0700" }, "message": "resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev\n\nChange-Id: Id8cb5e2e9d0c41bdaf767563ebd6e3951ae68a3c\n" } ], "next": "06a8702729309fa8eb5977142b26b8d8d0d6df7b" }