Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 19fa86cfd6fddb63715b50a4e0bc881d2ea34133
  1. 19fa86c am 5384d40e: (-s ours) am b79bb54e: am f4ba8731: am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  2. 409e42a am e19464aa: (-s ours) am 9ee1556d: am 296b120c: am a82db08e: (-s ours) am e73e14fd: am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  3. 14c8ace am 5fb35780: am daf113b1: am 5c6248c9: am 1310a1cd: (-s ours) am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  4. 5384d40 am b79bb54e: am f4ba8731: am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  5. e19464a am 9ee1556d: am 296b120c: am a82db08e: (-s ours) am e73e14fd: am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  6. 5fb3578 am daf113b1: am 5c6248c9: am 1310a1cd: (-s ours) am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  7. b79bb54 am f4ba8731: am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  8. 9ee1556 am 296b120c: am a82db08e: (-s ours) am e73e14fd: am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  9. daf113b am 5c6248c9: am 1310a1cd: (-s ours) am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  10. f4ba873 am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  11. 296b120 am a82db08e: (-s ours) am e73e14fd: am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  12. 5c6248c am 1310a1cd: (-s ours) am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  13. 06a3125 am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  14. 80b9016 am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  15. 3f1cc48 am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  16. b14ab8d am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  17. ae6a52e am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  18. e9ea028 am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  19. 338e32b am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  20. a82db08 am e73e14fd: am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  21. 6c1bf6b am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  22. e73e14f am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  23. 2db4037 am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  24. 8ed784e am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  25. 4f53d92 Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  26. 1eb506a Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  27. 509e5db Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev by Deepanshu Gupta · 10 years ago
  28. edc8b85 Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  29. 47a4001 Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev by Deepanshu Gupta · 10 years ago
  30. 1310a1c am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  31. ec50dfc am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  32. 20fc473 am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  33. f0336eb am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  34. 2cb287f am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  35. 0511ba5 Do not persist and restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  36. c39afe4 Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  37. 6a9c6c6 Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  38. e2370f0 Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  39. 26819e7 Resolve color xml attributes properly. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  40. 095cdf8 Resolve color xml attributes properly. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  41. cb6dfc2 Resolve color xml attributes properly. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  42. 9ea996a Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  43. 59eedf5 Layoutlib: Update wifi and battery icon for KK by Deepanshu Gupta · 10 years ago
  44. 7b561be am 09c3c2ed: am ba31d628: am db94ea9e: 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
  45. 09c3c2e am ba31d628: am db94ea9e: 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
  46. ba31d62 am db94ea9e: 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
  47. 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
  48. 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
  49. 79c3f67 am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  50. 206c691 am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  51. 72cf03a am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  52. 3a544a8 resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  53. a232a68 resolved conflicts for merge of 5476cfee to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  54. 5476cfe am 505c675c: Fix SystemProperties in LayoutLib. by Deepanshu Gupta · 10 years ago
  55. 505c675 Fix SystemProperties in LayoutLib. by Deepanshu Gupta · 10 years ago
  56. b86675f am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: 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
  57. f2c5a9ee am b9efa1e5: am 14a4e69c: 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
  58. b9efa1e am 14a4e69c: 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
  59. 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
  60. 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
  61. 3c92b93 am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: 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
  62. 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
  63. 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
  64. 62b81ac am 2df48bed: am 1bdfeadb: 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
  65. cee55fc am 99286edc: (-s ours) am aa0c1c75: am e83fa180: 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
  66. 8c71ff2 am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  67. 99286ed am aa0c1c75: am e83fa180: 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
  68. 2df48be am 1bdfeadb: 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
  69. 4c312f2 am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  70. 87234e8 am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  71. aa0c1c7 am e83fa180: 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
  72. 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
  73. 9c48ab8 am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  74. a3d2c7e am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  75. 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
  76. 964591a am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  77. 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
  78. 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
  79. ccf7b2a am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  80. 696eb4d am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  81. 85c7b20 am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  82. b8e4e8e am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  83. c3a7763 am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  84. c39916f am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  85. 918ca12 am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  86. 37f54f4 am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  87. 4627c98 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into klp-dev by Deepanshu Gupta · 10 years ago
  88. 5efee91 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  89. d3ac01f Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  90. 357ebfc Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  91. 10395cb Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  92. 710a55b Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  93. 5af7324 Fix style resolution for styles with '.' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  94. da28101 Fix style resolution for styles with '.' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  95. 0f49025 Fix style resolution for styles with '.' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  96. f2fa79e Fix style resolution for styles with '.' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  97. 575e334 am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  98. 813e2ac am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  99. 2e9dc1f am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: 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
  100. bda2862 am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago