Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 3a559d56a627687d56dc06cc459ef1e7e6b1cd79
  1. 3a559d5 am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 10 years ago
  2. b5b4756 am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 10 years ago
  3. 98822f0 am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 10 years ago
  4. 6e923e1 am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 10 years ago
  5. 90d5772 am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 10 years ago
  6. 209745a am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 10 years ago
  7. c251147 am 85ec1445: am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 10 years ago
  8. 85ec144 am f266873c: am 1c55797d: Fix build by Deepanshu Gupta · 10 years ago
  9. f266873 am 1c55797d: Fix build by Deepanshu Gupta · 10 years ago
  10. 1c55797 Fix build by Deepanshu Gupta · 10 years ago
  11. fea4b4d am 3450dc32: am 06018d92: 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 · 10 years ago
  12. 69ab594 am fcfb8801: am 18b1525a: 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 · 10 years ago
  13. cdc40eb am 6fd1703e: (-s ours) am 0d33f604: 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 · 10 years ago
  14. c909b4d am 2322a910: am 75fc74d6: am 203964c0: am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  15. 86726f5 am eb5b38b1: (-s ours) am a350f96e: 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 · 10 years ago
  16. 0573cff am b520cc45: am cf2af661: am 752b90f2: am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  17. 3450dc3 am 06018d92: 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 · 10 years ago
  18. fcfb880 am 18b1525a: 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 · 10 years ago
  19. 6fd1703 am 0d33f604: 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 · 10 years ago
  20. 2322a91 am 75fc74d6: am 203964c0: am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  21. eb5b38b am a350f96e: 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 · 10 years ago
  22. b520cc4 am cf2af661: am 752b90f2: am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  23. 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 · 10 years ago
  24. 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 · 10 years ago
  25. 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 · 10 years ago
  26. 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 · 10 years ago
  27. 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 · 10 years ago
  28. 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 · 10 years ago
  29. 14480ab am bfc75f68: am 11243dd6: am 9f5f450d: am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  30. 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
  31. 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 · 10 years ago
  32. 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 · 10 years ago
  33. 203964c am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  34. 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 · 10 years ago
  35. 752b90f am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  36. bfc75f6 am 11243dd6: am 9f5f450d: am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  37. 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 · 10 years ago
  38. 4e1023a am 89279ad1: (-s ours) am 9d3ec0be: am 48931fcc: am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  39. 900954e am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  40. ce33060 am 563d0ee7: am 04f0cb6e: am 34aa1bd3: am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  41. 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 · 10 years ago
  42. b7e1bef am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  43. 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 · 10 years ago
  44. 919ce20 am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  45. 8921409 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
  46. 2100476 am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  47. 9c7e306 am 1b0f6056: am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  48. b607cb82 am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  49. 11243dd am 9f5f450d: am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  50. 89279ad am 9d3ec0be: am 48931fcc: am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  51. 563d0ee am 04f0cb6e: am 34aa1bd3: am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  52. 9cc952e7 am b7b64cc4: am e0105901: am 52b49665: am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  53. c261cb0 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 · 10 years ago
  54. 03bf747 am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  55. 10fb4fe 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
  56. 31a3760 am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  57. 1b0f605 am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  58. 27c9b56 am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  59. 9f5f450 am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  60. d99dd3e am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp by Deepanshu Gupta · 10 years ago
  61. 964023c am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev by Deepanshu Gupta · 10 years ago
  62. c1847b5 am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  63. 9d3ec0b am 48931fcc: am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  64. 04f0cb6 am 34aa1bd3: am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  65. b7b64cc am e0105901: am 52b49665: am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  66. f354d01 am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  67. 858ab06 am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  68. e969ee5 resolved conflicts for merge of d388afad to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  69. 48931fc am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  70. 34aa1bd am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  71. e5c518c am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  72. aab6085 am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  73. e010590 am 52b49665: am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  74. 4e8b055 am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  75. a312214 am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  76. 54b946f am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  77. 52b4966 am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  78. ec1b4df resolved conflicts for merge of b161d6ba to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  79. 9358cf0 am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  80. f46900c am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  81. 6dad59e am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  82. eff94bc am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  83. ccf6b34 am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  84. 87a5405 am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  85. 85b7519 resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  86. a154687 am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  87. 8c19c6a am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  88. 5878115 resolved conflicts for merge of 9978c036 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  89. 16f3a61 am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  90. 84f5ace am 0b878070: (-s ours) am 61b1fd5c: am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  91. 382a0c7 am 3d9c18f2: am 9bdf54d3: am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  92. 0b87807 am 61b1fd5c: am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  93. 3d9c18f am 9bdf54d3: am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  94. 61b1fd5 am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  95. 9bdf54d am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  96. e14b24f am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  97. 41b3ef3 am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  98. 06ca4c6 am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 10 years ago
  99. 29171d5 am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago
  100. c0e9c66 resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev by Deepanshu Gupta · 10 years ago