Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 9ee1556d601e1f1f60a01bb7137bad48a7923a3d
  1. 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
  2. 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
  3. 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
  4. 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
  5. ae6a52e am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  6. e9ea028 am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  7. 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
  8. 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
  9. 8ed784e am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  10. 1eb506a Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  11. edc8b85 Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  12. 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
  13. ec50dfc am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  14. 20fc473 am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  15. f0336eb am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  16. 2cb287f am 9ea996a3: Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  17. c39afe4 Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  18. 6a9c6c6 Fix "@null" resource values in LayoutLib. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  19. 095cdf8 Resolve color xml attributes properly. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  20. 9ea996a Do not restore the media button event receiver by Jean-Michel Trivi · 10 years ago
  21. 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
  22. 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
  23. 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
  24. 79c3f67 am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  25. 206c691 am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  26. 72cf03a am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  27. 3a544a8 resolved conflicts for merge of a232a68d to jb-mr1.1-docs by Deepanshu Gupta · 10 years ago
  28. a232a68 resolved conflicts for merge of 5476cfee to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  29. 5476cfe am 505c675c: Fix SystemProperties in LayoutLib. by Deepanshu Gupta · 10 years ago
  30. 505c675 Fix SystemProperties in LayoutLib. by Deepanshu Gupta · 10 years ago
  31. 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
  32. 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
  33. 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
  34. 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
  35. 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
  36. 8c71ff2 am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  37. 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
  38. 87234e8 am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  39. 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
  40. 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
  41. 9c48ab8 am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  42. 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
  43. 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
  44. 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
  45. ccf7b2a am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  46. 696eb4d am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  47. 85c7b20 am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  48. b8e4e8e am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  49. c39916f am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  50. 918ca12 am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  51. 37f54f4 am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  52. 5efee91 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  53. d3ac01f Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  54. 357ebfc Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  55. 10395cb Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  56. 5af7324 Fix style resolution for styles with '.' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  57. da28101 Fix style resolution for styles with '.' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  58. 0f49025 Fix style resolution for styles with '.' [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  59. 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
  60. 1e34469 am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  61. b0470a1 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
  62. 0b48760 am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  63. 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
  64. 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
  65. d53a9fc am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  66. d2829b4 am 432d16f9: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  67. 979f9c6 am e30d3fdd: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  68. 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
  69. 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
  70. d751eed am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  71. e30d3fd Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  72. 432d16f Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  73. 5455ddc Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  74. 21b0aab Add a script to rename fonts for SDK. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  75. b49e21e Add a script to rename fonts for SDK. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  76. 55d525b am 716cc7dc: Add documentation for AndroidKeyStore by Robert Ly · 10 years ago
  77. ed5ab0f 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 · 10 years ago
  78. 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
  79. 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
  80. 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
  81. ffcad24 am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  82. 904b89c am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  83. 5d3e385 am af3f96e4: 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
  84. 12b657d am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  85. 295184b am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  86. 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
  87. dade24b Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 10 years ago
  88. 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
  89. 8782a12 resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  90. 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
  91. 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
  92. 61fb578 am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  93. f52fcc7 Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  94. e2edd75 am 76364c69: 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
  95. 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
  96. 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
  97. 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
  98. 4dcb4a1 am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  99. dd46bfd am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  100. 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