Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 6063e51f7a69810c844e7740959899d247957ca4
  1. 6063e51 Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev am: 44b24c9b38 am: 36481749e6 by Michael Wright · 8 years ago
  2. 8494730 Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev am: 44b24c9b38 by Wang Xiaolei · 8 years ago
  3. 9ab52ff Merge "Third time is the charm?" by Jeff Sharkey · 8 years ago
  4. 5fe3e5f Third time is the charm? by Jeff Sharkey · 8 years ago
  5. d8b6144 Merge "Maybe it will build this time?" by Jeff Sharkey · 8 years ago
  6. 5a780c0 Merge "Tethering: Own WiFi tethering state and lifetime" by TreeHugger Robot · 8 years ago
  7. b56d6ec Maybe it will build this time? by Jeff Sharkey · 8 years ago
  8. cbb36eb Merge "Follow refactoring to fix build." by Jeff Sharkey · 8 years ago
  9. a3ddfd5 Follow refactoring to fix build. by Jeff Sharkey · 8 years ago
  10. eb1419f Merge commit \'44b24c9b38d87dfd8bee2aca381f18a9106313dc\' into manual_merge_44b24c9 am: f5b0bf3563 by Jeff Sharkey · 8 years ago
  11. 04a2c0a Merge "resolve merge conflicts of 0c26c32 to master" by Jeff Sharkey · 8 years ago
  12. a0d2e12 resolve merge conflicts of 0c26c32 to master by Jeff Sharkey · 8 years ago
  13. b8fff38 Fix build after merge. am: 9351225839 by Jeff Sharkey · 8 years ago
  14. c363018 Merge "Fix a link to CustomTabsCallback in support-library docs." by Aurimas Liutikas · 8 years ago
  15. 9351225 Fix build after merge. by Jeff Sharkey · 8 years ago
  16. f82032f Fix a link to CustomTabsCallback in support-library docs. by Aurimas Liutikas · 8 years ago
  17. f1315c3 Tethering: Own WiFi tethering state and lifetime by Christopher Wiley · 8 years ago
  18. 6b18530 Fix code example in testing-support-library. by Aurimas Liutikas · 8 years ago
  19. 0c26c32 Merge commit \'44b24c9b38d87dfd8bee2aca381f18a9106313dc\' into manual_merge_44b24c9 by Wang Xiaolei · 8 years ago
  20. f5b0bf3 Merge commit '44b24c9b38d87dfd8bee2aca381f18a9106313dc' into manual_merge_44b24c9 by Jeff Sharkey · 8 years ago
  21. a098b37 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 8ad820ef54 -s ours by Bill Yi · 8 years ago
  22. 2f09a29 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev by Bill Yi · 8 years ago
  23. 3648174 Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev by Michael Wright · 8 years ago
  24. 8ad820e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev by TreeHugger Robot · 8 years ago
  25. 9136f4f resolve merge conflicts of 9eb77405 to nyc-dev-plus-aosp am: 950abbd075 by Pavlin Radoslavov · 8 years ago
  26. bd398d6 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2e032b7463 -s ours" into nyc-mr1-dev-plus-aosp by Bill Yi · 8 years ago
  27. f604fec Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730 -s ours am: cc44ccf2f9 -s ours by Bill Yi · 8 years ago
  28. a842015 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f -s ours am: 6c4a3962e7 -s ours by Bill Yi · 8 years ago
  29. 0b78b92 resolve merge conflicts of 9eb77405 to nyc-dev-plus-aosp am: 950abbd075 by Sanket Agarwal · 8 years ago
  30. 9103508 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730 -s ours am: 27bdfbf794 -s ours by Bill Yi · 8 years ago
  31. 056314c Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f -s ours am: 373ad6f5a1 -s ours by Bill Yi · 8 years ago
  32. dfba35f Merge "Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am: cd44a32dfe am: 564dc9d0f7" into nyc-mr1-dev-plus-aosp by Eino-Ville Talvala · 8 years ago
  33. 90ac209 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2e032b7463 -s ours" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  34. ac11fa5 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev by Bill Yi · 8 years ago
  35. 1f91433 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730 -s ours by Bill Yi · 8 years ago
  36. f21ed27 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f -s ours by Bill Yi · 8 years ago
  37. bb133d5 Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am: cd44a32dfe am: 02c43050af by Eino-Ville Talvala · 8 years ago
  38. e55d263 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730 -s ours by Bill Yi · 8 years ago
  39. 0957435 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f -s ours by Bill Yi · 8 years ago
  40. 2d49475 Merge "Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am: cd44a32dfe am: 564dc9d0f7" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  41. 950abbd resolve merge conflicts of 9eb77405 to nyc-dev-plus-aosp by Pavlin Radoslavov · 8 years ago
  42. 2e032b7 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev by TreeHugger Robot · 8 years ago
  43. 9afecca Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am: cd44a32dfe by Eino-Ville Talvala · 8 years ago
  44. 33c4afd Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am: cd44a32dfe by Eino-Ville Talvala · 8 years ago
  45. 44b24c9 Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev by Wang Xiaolei · 8 years ago
  46. 27bdfbf Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730 -s ours by Bill Yi · 8 years ago
  47. 373ad6f Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f -s ours by Bill Yi · 8 years ago
  48. 02c4305 Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am: cd44a32dfe by Eino-Ville Talvala · 8 years ago
  49. cc44ccf Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10e29e0730 -s ours by Bill Yi · 8 years ago
  50. 6c4a396 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93bc210b3f -s ours by Bill Yi · 8 years ago
  51. 564dc9d Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am: cd44a32dfe by Eino-Ville Talvala · 8 years ago
  52. 0208df0 Merge "Merge "Avoid triggering support dialog in non-current user." into nyc-dev am: 5548733eb5 am: 2a098206c4 am: 2590281320" by Android Build Merger (Role) · 8 years ago
  53. 5ffb1a0 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 237b52f40c -s ours am: 1bef62e488 -s ours am: 166d6e9254 -s ours" by Android Build Merger (Role) · 8 years ago
  54. 2045509 Merge "Add additional type check for animating along a path" by Doris Liu · 8 years ago
  55. 10e29e0 Merge "Import translations. DO NOT MERGE" into nyc-dev by TreeHugger Robot · 8 years ago
  56. ced9a42 Merge "Avoid triggering support dialog in non-current user." into nyc-dev am: 5548733eb5 am: 2a098206c4 by Sudheer Shanka · 8 years ago
  57. d560912 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 237b52f40c -s ours am: 1bef62e488 -s ours by Bill Yi · 8 years ago
  58. 21ea400 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 31cd8615b2 -s ours am: 85e1b30a61 -s ours by Bill Yi · 8 years ago
  59. 93bc210 Merge "Import translations. DO NOT MERGE" into nyc-dev by TreeHugger Robot · 8 years ago
  60. 00c6b8f Merge "Import translations. DO NOT MERGE" into nyc-dev am: 52edfafb9c -s ours am: d5d030af8b -s ours by Bill Yi · 8 years ago
  61. 5dbddf8 Merge "Import translations. DO NOT MERGE" into nyc-dev am: f79616b427 -s ours am: 88fdea080f -s ours by Bill Yi · 8 years ago
  62. cd44a32 Merge "Camera2: Update lensShadingMap documentation" into nyc-dev by Eino-Ville Talvala · 8 years ago
  63. 9eb7740 Merge "While turning OFF do not honor ON requests." am: 104518e4c4 by Sanket Agarwal · 8 years ago
  64. 9544b69 Merge "Import translations. DO NOT MERGE" into nyc-dev am: a68d1f10e2 -s ours am: abd7b12ada -s ours by Bill Yi · 8 years ago
  65. bfd159e Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2130b28754 -s ours am: a547d62f78 -s ours by Bill Yi · 8 years ago
  66. 3abb3eb Merge "Import translations. DO NOT MERGE" into nyc-dev am: ef2989920d -s ours am: 5346695e1d -s ours by Bill Yi · 8 years ago
  67. 72713be Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3d9d9fa0d9 -s ours am: a1ba60ce29 -s ours by Bill Yi · 8 years ago
  68. 2b12289 Merge "Import translations. DO NOT MERGE" into nyc-dev am: cace07e727 -s ours am: 337c1b1108 -s ours by Bill Yi · 8 years ago
  69. 2590281 Merge "Avoid triggering support dialog in non-current user." into nyc-dev am: 5548733eb5 by Sudheer Shanka · 8 years ago
  70. 166d6e9 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 237b52f40c -s ours by Bill Yi · 8 years ago
  71. 2a9bf18 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 31cd8615b2 -s ours by Bill Yi · 8 years ago
  72. 3008905 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 52edfafb9c -s ours by Bill Yi · 8 years ago
  73. d498347 Merge "Import translations. DO NOT MERGE" into nyc-dev am: f79616b427 -s ours by Bill Yi · 8 years ago
  74. 104518e Merge "While turning OFF do not honor ON requests." by Treehugger Robot · 8 years ago
  75. 46333ca Merge "Merge "Avoid triggering support dialog in non-current user." into nyc-dev am: 5548733eb5 am: 8ebc6e80b8" into nyc-mr1-dev-plus-aosp by Sudheer Shanka · 8 years ago
  76. 4a1cee4 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 237b52f40c -s ours am: 81a108d038 -s ours" into nyc-mr1-dev-plus-aosp by Bill Yi · 8 years ago
  77. 1e6abe0 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 31cd8615b2 -s ours am: 498f780f42 -s ours" into nyc-mr1-dev-plus-aosp by Bill Yi · 8 years ago
  78. 4f16463 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 52edfafb9c -s ours am: 7d627e9cf0 -s ours" into nyc-mr1-dev-plus-aosp by Bill Yi · 8 years ago
  79. 6c79212 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: f79616b427 -s ours am: c29b39b95f -s ours" into nyc-mr1-dev-plus-aosp by Bill Yi · 8 years ago
  80. 4761069 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 12d1f5d5c0 -s ours by Bill Yi · 8 years ago
  81. 3918123 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 3cfbe6e7ea -s ours by Bill Yi · 8 years ago
  82. b6869f8 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 7d84e110cb -s ours by Bill Yi · 8 years ago
  83. c8f08fd Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d8a450557e -s ours by Bill Yi · 8 years ago
  84. 7333b0d Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: cb4bea3ae8 -s ours by Bill Yi · 8 years ago
  85. ee5dd4e Merge "Import translations. DO NOT MERGE" into nyc-dev am: a68d1f10e2 -s ours by Bill Yi · 8 years ago
  86. 3e598ff Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2130b28754 -s ours by Bill Yi · 8 years ago
  87. 4a78699 Merge "Import translations. DO NOT MERGE" into nyc-dev am: ef2989920d -s ours by Bill Yi · 8 years ago
  88. 1a4e544 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3d9d9fa0d9 -s ours by Bill Yi · 8 years ago
  89. 9e14fb3 Merge "Import translations. DO NOT MERGE" into nyc-dev am: cace07e727 -s ours by Bill Yi · 8 years ago
  90. c56c321 Merge "Merge "Avoid triggering support dialog in non-current user." into nyc-dev am: 5548733eb5 am: 8ebc6e80b8" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  91. b48b0bc Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 237b52f40c -s ours am: 81a108d038 -s ours" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  92. 70f0bb3 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 31cd8615b2 -s ours am: 498f780f42 -s ours" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  93. 6825490 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 52edfafb9c -s ours am: 7d627e9cf0 -s ours" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  94. 95d6b19 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: f79616b427 -s ours am: c29b39b95f -s ours" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  95. 2771de2 Merge "Avoid triggering support dialog in non-current user." into nyc-dev am: 5548733eb5 by Sudheer Shanka · 8 years ago
  96. 2fe8753 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 237b52f40c -s ours by Bill Yi · 8 years ago
  97. 165784c Merge "Import translations. DO NOT MERGE" into nyc-dev am: 31cd8615b2 -s ours by Bill Yi · 8 years ago
  98. 18f07fd Merge "Import translations. DO NOT MERGE" into nyc-dev am: 52edfafb9c -s ours by Bill Yi · 8 years ago
  99. 774f4e4 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev by Bill Yi · 8 years ago
  100. 536351e Merge "Import translations. DO NOT MERGE" into nyc-dev am: f79616b427 -s ours by Bill Yi · 8 years ago