Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 85c7b209c3babea164f5bec13352e7f5f262ea58
  1. 85c7b20 am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  2. 918ca12 am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  3. 5efee91 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  4. 10395cb Fix default level flags for bidi. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  5. 0f49025 Fix style resolution for styles with '.' [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  6. bda2862 am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  7. 1e34469 am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  8. 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 · 11 years ago
  9. 0b48760 am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  10. 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 · 11 years ago
  11. 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 · 11 years ago
  12. d53a9fc am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  13. d2829b4 am 432d16f9: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  14. 979f9c6 am e30d3fdd: Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  15. 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 · 11 years ago
  16. 5d0db7f am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  17. d751eed am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  18. e30d3fd Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  19. 432d16f Change font family name. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  20. 5455ddc Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  21. 21b0aab Add a script to rename fonts for SDK. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  22. b49e21e Add a script to rename fonts for SDK. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  23. 55d525b am 716cc7dc: Add documentation for AndroidKeyStore by Robert Ly · 11 years ago
  24. 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 · 11 years ago
  25. 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
  26. 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
  27. 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
  28. ffcad24 am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  29. 904b89c am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  30. 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 · 11 years ago
  31. 12b657d am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  32. 295184b am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  33. 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 · 11 years ago
  34. dade24b Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  35. 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
  36. 8782a12 resolved conflicts for merge of 61fb5784 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  37. 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
  38. b1ca2a0 am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  39. 61fb578 am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  40. f52fcc7 Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  41. 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 · 11 years ago
  42. 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 · 11 years ago
  43. 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 · 11 years ago
  44. 3c1d72c am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  45. 4dcb4a1 am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  46. dd46bfd am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  47. ab869de am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  48. 236b716 am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  49. 02d88f7 am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  50. cd192c0b am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  51. 0ab0d87 am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  52. ffbf244 am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  53. 704954c am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  54. 28f550f am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  55. 083af20 am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  56. 5f56ea8 am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  57. 2ac96a0 am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  58. 03a8326 am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  59. f48ab8f am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  60. 531bdb5 am fe6f3049: Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  61. 3ff08eb6 Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  62. 3b7c09b LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  63. 03c0735 Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  64. 08d2007 LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  65. fe6f304 Remove @NonNull attribute [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  66. 866d40f Distinguish between menus in ActionBar and popup. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  67. a0fc1f4 LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  68. f57871f am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  69. 98822f0 am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  70. 888dad0 am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  71. 6e923e1 am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  72. f33a2f6 am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  73. 90d5772 am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  74. f5af9a4 am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  75. 209745a am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  76. 273c5c3 am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  77. c251147 am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  78. 9ca7a03 resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  79. 85ec144 am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  80. e0be42a am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  81. f266873 am 1c55797d: Fix build by Deepanshu Gupta · 11 years ago
  82. 40bfb60 Fix build due to incorrect merges [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  83. 1c55797 Fix build by Deepanshu Gupta · 11 years ago
  84. 06018d9 am f41a380b: 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 · 11 years ago
  85. 18b1525 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
  86. 0d33f60 am 4dff881b: am 7b9cc710: (-s ours) am 9c7e3064: am 1b0f6056: am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  87. 75fc74d am 203964c0: am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  88. a350f96 am 0eb268a0: am 22dabb52: (-s ours) am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  89. cf2af66 am 752b90f2: am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  90. 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 · 11 years ago
  91. 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
  92. 4dff881 am 7b9cc710: (-s ours) am 9c7e3064: am 1b0f6056: am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  93. 203964c am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  94. 0eb268a am 22dabb52: (-s ours) am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  95. 752b90f am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  96. d10ca17 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 · 11 years ago
  97. 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
  98. 7b9cc71 am 9c7e3064: am 1b0f6056: am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  99. b7e1bef am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  100. 22dabb5 am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] by Deepanshu Gupta · 11 years ago