Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 1eb506aa8cd2045f1d7c75d7c9e59df6a103c1e5
  1. 1eb506a Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  2. 6a9c6c6 Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  3. 095cdf8 Resolve color xml attributes properly. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  4. db94ea9 am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  5. f970d2c am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  6. 79c3f67 am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  7. 206c691 am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  8. 72cf03a am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  9. 3a544a8 resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  10. a232a68 resolved conflicts for merge of 5476cfee to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  11. 5476cfe am 505c675c: Fix SystemProperties in LayoutLib. by Deepanshu Gupta · 10 years ago
  12. 505c675 Fix SystemProperties in LayoutLib. by Deepanshu Gupta · 10 years ago
  13. 14a4e69 am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  14. c735197 am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  15. a3966c6 am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  16. 6274394 am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  17. 8c71ff2 am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  18. 87234e8 am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  19. 1bdfead am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  20. 9c48ab8 am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  21. 610341b am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  22. e83fa18 am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  23. 95bbeb9 am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  24. ccf7b2a am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  25. 696eb4d am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  26. b8e4e8e am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  27. c39916f am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  28. 37f54f4 am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  29. 5efee91 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  30. d3ac01f Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  31. 357ebfc Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  32. 10395cb Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  33. 5af7324 Fix style resolution for styles with '.' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  34. da28101 Fix style resolution for styles with '.' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  35. 0f49025 Fix style resolution for styles with '.' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  36. 1e34469 am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  37. 0b48760 am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  38. d7ce845 am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  39. 10e5407 am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  40. d53a9fc am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  41. 979f9c6 am e30d3fdd: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  42. ca82da9 am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  43. 5d0db7f am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  44. e30d3fd Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  45. 432d16f Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  46. 5455ddc Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  47. 21b0aab Add a script to rename fonts for SDK. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  48. b49e21e Add a script to rename fonts for SDK. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  49. 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 · 10 years ago
  50. bad112f am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  51. c8235b8 am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  52. ffcad24 am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  53. 904b89c am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  54. 295184b am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  55. af3f96e am e87c63e0: (-s ours) 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 · 10 years ago
  56. dade24b Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  57. 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 · 10 years ago
  58. 8782a12 resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  59. d2dff39 am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  60. b1ca2a0 am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  61. 61fb578 am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  62. f52fcc7 Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  63. 76364c6 am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  64. d0f2157 am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  65. 3c1d72c am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  66. ab869de am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  67. 236b716 am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  68. 02d88f7 am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  69. cd192c0b am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  70. 0ab0d87 am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  71. ffbf244 am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  72. 704954c am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  73. 28f550f am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  74. 083af20 am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  75. 5f56ea8 am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  76. 03a8326 am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  77. f48ab8f am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  78. 531bdb5 am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  79. 3ff08eb6 Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  80. 3b7c09b LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  81. 03c0735 Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  82. 08d2007 LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  83. fe6f304 Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  84. 866d40f Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  85. a0fc1f4 LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  86. 888dad0 am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  87. 6e923e1 am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 10 years ago
  88. f33a2f6 am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  89. 90d5772 am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 10 years ago
  90. f5af9a4 am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  91. 209745a am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 10 years ago
  92. 273c5c3 am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  93. c251147 am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 10 years ago
  94. 9ca7a03 resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  95. 85ec144 am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 10 years ago
  96. e0be42a am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  97. f266873 am 1c55797d: Fix build by Deepanshu Gupta · 10 years ago
  98. 40bfb60 Fix build due to incorrect merges [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  99. 1c55797 Fix build by Deepanshu Gupta · 10 years ago
  100. f41a380 am d10ca17d: am 8921409a: am 10fb4fe4: am d99dd3e7: am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp by Deepanshu Gupta · 10 years ago