Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 04f0cb6e958cc1529e3be04ef454a35f416d9667
  1. 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 · 11 years ago
  2. 34aa1bd am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  3. 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 · 11 years ago
  4. 54b946f am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  5. 52b4966 am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  6. f46900c am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  7. eff94bc am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  8. 87a5405 am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  9. 8c19c6a am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  10. 5878115 resolved conflicts for merge of 9978c036 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  11. 16f3a61 am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  12. 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 · 11 years ago
  13. 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 · 11 years ago
  14. 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 · 11 years ago
  15. 41b3ef3 am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  16. 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 · 11 years ago
  17. 29171d5 am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  18. c0e9c66 resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  19. 1281853 am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  20. eb03602 am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  21. 2de8509 am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  22. 14788ef am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  23. 7d5299c am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  24. 6d091cd am 2d84de2f: am 0d76fd64: (-s ours) am 3e7f0a20: am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  25. 5806ec7 am f29a0516: am 0c11327b: (-s ours) am d4d66df6: am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  26. b110aa8 am 41764152: am 8a505e5c: (-s ours) am 74d2a533: am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  27. 4024fe9 am 28c76e3e: am 5db08e87: (-s ours) am ce68e782: am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  28. a73bc03 am 471061ce: am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  29. 2d84de2 am 0d76fd64: (-s ours) am 3e7f0a20: am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  30. f29a051 am 0c11327b: (-s ours) am d4d66df6: am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  31. 4176415 am 8a505e5c: (-s ours) am 74d2a533: am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  32. 28c76e3 am 5db08e87: (-s ours) am ce68e782: am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  33. 471061c am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  34. e0d3e66 am 2f8da100: am 81ac665c: (-s ours) am 060836bd: am fed25eb8: am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  35. 39daf02 am 1eadb79e: am fd8af673: (-s ours) am 9e614b25: am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  36. a63a1f9 am 910c7153: am be0c94ea: (-s ours) am be2184e4: am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  37. af6dcd4 am 48e3d0fa: am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  38. 0d76fd6 am 3e7f0a20: am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  39. 0c11327 am d4d66df6: am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  40. 8a505e5 am 74d2a533: am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  41. 5db08e8 am ce68e782: am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  42. e74d437 am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  43. 2f8da10 am 81ac665c: (-s ours) am 060836bd: am fed25eb8: am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  44. 1eadb79 am fd8af673: (-s ours) am 9e614b25: am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  45. 910c715 am be0c94ea: (-s ours) am be2184e4: am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  46. 48e3d0f am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  47. 3e7f0a2 am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  48. d4d66df am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  49. 74d2a53 am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  50. ce68e78 am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  51. c5c49dc am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  52. 81ac665 am 060836bd: am fed25eb8: am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  53. fd8af67 am 9e614b25: am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  54. be0c94e am be2184e4: am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  55. dbfd29d am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  56. 5dce0a4 am a1191b46: am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  57. 776c192 am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  58. 26dd61c am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  59. bb7cfa1 am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  60. e535ff2 am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  61. 8b78a1d am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  62. f8c5685 resolved conflicts for merge of 727ad350 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  63. 060836b am fed25eb8: am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  64. 9e614b2 am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  65. be2184e am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  66. 81ff5ba am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  67. 3c9fcea am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  68. 0700905 am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  69. 85c5cdc am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  70. 488f624 am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  71. a1191b4 am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  72. fed25eb am c233bb65: am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  73. 204316c am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  74. cfc9e4e am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  75. 72e3fc1 am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  76. 74503f6 am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  77. 9f00e65 resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  78. c233bb6 am 8a4f3935: am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  79. 8cf3343 am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  80. d62dcc2 am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  81. 6f58831 resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  82. 0c98ce5 am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  83. f75f33d am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  84. 8b53c5b am ebcbb283: am 0b2f4a18: (-s ours) am 20bec39e: am f1517cc9: am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  85. 40db4a1 am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  86. ebcbb28 am 0b2f4a18: (-s ours) am 20bec39e: am f1517cc9: am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  87. 9ddb073 am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  88. 0b2f4a1 am 20bec39e: am f1517cc9: am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  89. c70ce72 am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  90. dd8ebf1 resolved conflicts for merge of 520f585b to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  91. 20bec39 am f1517cc9: am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  92. af9fde9 am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  93. 9978c03 am 1867f58d: am 3027b69e: am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  94. f1517cc am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  95. 8e015b7 am a5461ebf: resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev by Deepanshu Gupta · 11 years ago
  96. 425addb am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  97. 69bae78 am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  98. 1867f58 am 3027b69e: am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] by Deepanshu Gupta · 11 years ago
  99. dff29f7 am 5974d229: am 0cbfde12: am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago
  100. a43aaf0 resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev by Deepanshu Gupta · 11 years ago