Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / b024fd208720b9d0e5fd5cd4c7fb09c19b1a86ad / tools
  1. 03df93b am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  2. 5cde33a am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  3. dcfba78 am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  4. 022d8a9 am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  5. bad112f am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  6. e4aa313 am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev by Deepanshu Gupta · 11 years ago
  7. c8235b8 am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  8. 2983ee5 am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  9. 904b89c am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  10. 295184b am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  11. e87c63e am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  12. 8782a12 resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  13. d2dff39 am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  14. 61fb578 am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  15. 0ab0d87 am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  16. ffbf244 am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  17. 704954c am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  18. 661e158 am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  19. 28f550f am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  20. 083af20 am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  21. 5f56ea8 am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  22. 8f6a9a6 am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  23. f48ab8f am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  24. 3ff08eb6 Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  25. 3b7c09b LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  26. 03c0735 Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  27. 08d2007 LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  28. fe6f304 Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  29. 866d40f Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  30. a0fc1f4 LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  31. 79f45b4 Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  32. 8974a5e LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  33. c289ec6 am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  34. 3a559d5 am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  35. b5b4756 am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  36. 6e923e1 am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  37. 90d5772 am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  38. 209745a am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  39. 85ec144 am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  40. e0be42a am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  41. f266873 am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  42. 40bfb60 Fix build due to incorrect merges [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  43. 1c55797 Fix build by Deepanshu Gupta · 11 years ago
  44. 569dc64 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 by Deepanshu Gupta · 11 years ago
  45. 69ab594 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 by Deepanshu Gupta · 11 years ago
  46. fcfb880 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 by Deepanshu Gupta · 11 years ago
  47. ef24a50 am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  48. 900954e am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  49. 2100476 am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  50. 964023c am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  51. 70efbad am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp by Deepanshu Gupta · 11 years ago
  52. 8bf73ea am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  53. bd5a3e6 am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp by Deepanshu Gupta · 11 years ago
  54. 01fefec 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 by Deepanshu Gupta · 11 years ago
  55. 5fc8f94 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 by Deepanshu Gupta · 11 years ago
  56. 0ad4f2c resolved conflicts for merge of 7377c7be to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  57. 5454be0 am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  58. d388afa am b6de60e0: am df2da3d7: am 7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  59. b161d6b am 673d9734: resolved conflicts for merge of 00d09649 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  60. 5dae7fda am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  61. b6de60e am df2da3d7: am 7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  62. b0f2ded am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  63. 9ddb073 am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  64. c70ce72 am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  65. af9fde9 am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  66. 673d973 resolved conflicts for merge of 00d09649 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  67. cc9e359 am 5280c911: am 0df5ae65: am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  68. 9978c03 am 1867f58d: am 3027b69e: am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  69. 8e015b7 am a5461ebf: resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  70. 5280c91 am 0df5ae65: am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  71. 1867f58 am 3027b69e: am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  72. a43aaf0 resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  73. a5461eb resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  74. 0f26b51 am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  75. 727ad35 am 5594616c: am 9602fc1c: am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  76. 627cab1 am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  77. effef17 am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  78. c3a0c9f am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  79. 835cbaa am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  80. ce9e87f am 8c5c2410: am 7bb8de58: am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  81. 8a4f393 am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  82. 838e548 am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  83. df8a15b am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  84. 5f61e9b am ed98abec: am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp by Deepanshu Gupta · 11 years ago
  85. 520f585 am 2cbe100a: am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  86. 2c167d0 am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  87. 9053261 am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  88. 5594616 am 9602fc1c: am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  89. 45693e5 am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  90. e3b43270 am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  91. 45ca5ba am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  92. 9f96525 am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  93. 8c5c241 am 7bb8de58: am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  94. 48bf7b4 am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  95. 94d33cf am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  96. d4e6727 am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  97. ed98abe am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp by Deepanshu Gupta · 11 years ago
  98. 2cbe100 am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  99. 632c9e2 am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  100. 9c00e67 am 2fb139e0: resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev by Deepanshu Gupta · 11 years ago