Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / frameworks / base / a7ce11070a74f7a0447f0d40d51cb0d3f95999fd
  1. a7ce110 am 19fa86cf: 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. ae6f259 am 409e42a1: 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. 800f3ca am 14c8acef: 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. 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
  5. 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
  6. 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
  7. 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
  8. 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
  9. 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
  10. 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
  11. 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
  12. 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
  13. 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
  14. 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
  15. 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
  16. 2d70a5a am 06a31255: 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
  17. 6a6e63a am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  18. 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
  19. 80b9016 am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  20. 3f1cc48 am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  21. b14ab8d am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  22. ae6a52e am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  23. e9ea028 am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  24. 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
  25. 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
  26. 0ddd915 am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev by Deepanshu Gupta · 10 years ago
  27. 1c3a884 am 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev by Deepanshu Gupta · 10 years ago
  28. 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
  29. 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
  30. 2db4037 am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  31. 8ed784e am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  32. 4f53d92 Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  33. 1eb506a Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  34. 509e5db Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev by Deepanshu Gupta · 10 years ago
  35. edc8b85 Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  36. 47a4001 Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev by Deepanshu Gupta · 10 years ago
  37. 6d4873f am 0511ba50: Do not persist and restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  38. 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
  39. ec50dfc am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  40. 20fc473 am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  41. f0336eb am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  42. 2cb287f am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  43. 0511ba5 Do not persist and restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  44. c39afe4 Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  45. 6a9c6c6 Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  46. e2370f0 Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  47. 26819e7 Resolve color xml attributes properly. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  48. 095cdf8 Resolve color xml attributes properly. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  49. cb6dfc2 Resolve color xml attributes properly. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  50. 9ea996a Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  51. b6c923a am 59eedf52: Layoutlib: Update wifi and battery icon for KK by Deepanshu Gupta · 10 years ago
  52. 59eedf5 Layoutlib: Update wifi and battery icon for KK by Deepanshu Gupta · 10 years ago
  53. 904d771 am 7b561be3: 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
  54. 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
  55. 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
  56. 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
  57. 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
  58. 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
  59. 79c3f67 am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  60. 206c691 am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  61. 72cf03a am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  62. 3a544a8 resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  63. a232a68 resolved conflicts for merge of 5476cfee to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  64. 5476cfe am 505c675c: Fix SystemProperties in LayoutLib. by Deepanshu Gupta · 10 years ago
  65. 505c675 Fix SystemProperties in LayoutLib. by Deepanshu Gupta · 10 years ago
  66. f365928 Doc change: add reminder for developers on using ad id. by Dirk Dougherty · 10 years ago
  67. d32dd29 am b86675f1: 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
  68. 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
  69. f2c5a9e 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
  70. 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
  71. 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
  72. 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
  73. 3f51ab0 am 3c92b932: 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
  74. 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
  75. c35afdf am cee55fc1: 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
  76. 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
  77. 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
  78. 7f98066 am 4c312f20: 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
  79. 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
  80. 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
  81. 8c71ff2 am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  82. 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
  83. 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
  84. 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
  85. 87234e8 am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  86. efd2968 am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  87. 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
  88. 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
  89. 9c48ab8 am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  90. 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
  91. 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
  92. 964591a am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  93. 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
  94. d8d3e87 am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev by Deepanshu Gupta · 10 years ago
  95. 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
  96. ccf7b2a am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  97. 696eb4d am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  98. 85c7b20 am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  99. b8e4e8e am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  100. c3a7763 am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago