Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 6fdb5e6df178b3b1062ac67b505b288aa609a66b
  1. 6fdb5e6 resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp by Jeff Brown · 11 years ago
  2. 280fe93 am 7a67c927: am ecdf9b19: Merge "jni: liblog reading error API incorrect" by Mark Salyzyn · 11 years ago
  3. 7a67c92 am ecdf9b19: Merge "jni: liblog reading error API incorrect" by Mark Salyzyn · 11 years ago
  4. ecdf9b1 Merge "jni: liblog reading error API incorrect" by Mark Salyzyn · 11 years ago
  5. 769a247 am b6ab8c17: am a6f5e79d: Merge "Allow connections to multiple zygotes." by Narayan Kamath · 11 years ago
  6. b6ab8c1 am a6f5e79d: Merge "Allow connections to multiple zygotes." by Narayan Kamath · 11 years ago
  7. a6f5e79 Merge "Allow connections to multiple zygotes." by Narayan Kamath · 11 years ago
  8. 4444dcd Allow connections to multiple zygotes. by Narayan Kamath · 11 years ago
  9. 9f77700 am 05f980d4: am d4b64409: Merge "Make zygotes aware of their supported ABIs." by Narayan Kamath · 11 years ago
  10. 97175de am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime args." by Narayan Kamath · 11 years ago
  11. 05f980d am d4b64409: Merge "Make zygotes aware of their supported ABIs." by Narayan Kamath · 11 years ago
  12. 3856a21 am cecfb94f: Merge "Clean up argc / argv processing for runtime args." by Narayan Kamath · 11 years ago
  13. d4b6440 Merge "Make zygotes aware of their supported ABIs." by Narayan Kamath · 11 years ago
  14. cecfb94 Merge "Clean up argc / argv processing for runtime args." by Narayan Kamath · 11 years ago
  15. c41638c Make zygotes aware of their supported ABIs. by Narayan Kamath · 11 years ago
  16. 22ec1ee Clean up argc / argv processing for runtime args. by Narayan Kamath · 11 years ago
  17. dc7eb9c am 00cfbe82: am a5608acb: Merge "Don\'t allow MemoryFiles of negative length." by Narayan Kamath · 11 years ago
  18. 7f9599d am ea72cdf2: Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev by Jeff Brown · 11 years ago
  19. 00cfbe8 am a5608acb: Merge "Don\'t allow MemoryFiles of negative length." by Narayan Kamath · 11 years ago
  20. a5608ac Merge "Don't allow MemoryFiles of negative length." by Narayan Kamath · 11 years ago
  21. 7289f3a Merge "Move certain internal activity manager methods to new class." into klp-modular-dev by Jeff Brown · 11 years ago
  22. ea72cdf Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev by Jeff Brown · 11 years ago
  23. 13014b5 Move certain internal activity manager methods to new class. by Jeff Brown · 11 years ago
  24. ad9ef19 Move display power controller to display manager service. (DO NOT MERGE) by Jeff Brown · 11 years ago
  25. b519aec jni: liblog reading error API incorrect by Mark Salyzyn · 11 years ago
  26. 668b1bf resolved conflicts for merge of bd6c5577 to klp-modular-dev-plus-aosp by Adam Hampson · 11 years ago
  27. bd6c557 Merge "DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime." into klp-modular-dev by Adam Hampson · 11 years ago
  28. f626ca2 Don't allow MemoryFiles of negative length. by Narayan Kamath · 11 years ago
  29. 56868fb am 0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev by Baligh Uddin · 11 years ago
  30. 0cf836a Merge "Import translations. DO NOT MERGE" into klp-modular-dev by Baligh Uddin · 11 years ago
  31. c742215 DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime. by Narayan Kamath · 11 years ago
  32. 8f2adcb am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity." by Craig Mautner · 11 years ago
  33. 228cefa am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity." by Craig Mautner · 11 years ago
  34. 3fb2b71 Merge "[ActivityManager] Reduce report ANR on wrong activity." by Craig Mautner · 11 years ago
  35. ec571bd am ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev by Adam Hampson · 11 years ago
  36. ce802f48 Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev by Adam Hampson · 11 years ago
  37. 4455c59 am 0468e3c7: am e1d4847c: am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  38. 0468e3c am e1d4847c: am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  39. f00b906 am cb163c68: am c855a28a: am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev by Robert Greenwalt · 11 years ago
  40. e1d4847c1 am 331fa429: am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  41. cb163c6 am c855a28a: am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev by Robert Greenwalt · 11 years ago
  42. 331fa42 am a3d3e8c4: (-s ours) am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  43. c855a28 am 5f3c0630: am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev by Robert Greenwalt · 11 years ago
  44. a3d3e8c am 463eeb70: am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  45. 5f3c063 am 522bd7fb: (-s ours) am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev by Robert Greenwalt · 11 years ago
  46. 463eeb7 am 2676e36f: am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  47. 522bd7f am 24444abf: am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev by Robert Greenwalt · 11 years ago
  48. 2676e36 am 3e604b11: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  49. 24444ab am 53691e39: am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev by Robert Greenwalt · 11 years ago
  50. 3e604b1 am 2c90609c: am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  51. 53691e3 am 128e9371: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev by Robert Greenwalt · 11 years ago
  52. 2c90609 am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  53. 128e937 am 106627e0: am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev by Robert Greenwalt · 11 years ago
  54. 339cfdb am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  55. 106627e am e42ce676: am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev by Robert Greenwalt · 11 years ago
  56. 72f9b30 am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  57. e42ce67 am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev by Robert Greenwalt · 11 years ago
  58. 4bc58bd am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  59. c0d94e7 am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  60. ebf23a8 am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev by Robert Greenwalt · 11 years ago
  61. f52d1a5 am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  62. 74acf23 am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev by Robert Greenwalt · 11 years ago
  63. 3c417fb Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev by Robert Greenwalt · 11 years ago
  64. 309ca5d [ActivityManager] Reduce report ANR on wrong activity. by riddle_hsu · 11 years ago
  65. c4a80ac Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  66. f403d60 am 17878a9a: am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs by quddusc · 11 years ago
  67. 17878a9 am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs by quddusc · 11 years ago
  68. b430ec7 am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs by quddusc · 11 years ago
  69. 7db3875 Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs by quddusc · 11 years ago
  70. acf395f am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" by Etienne Le Grand · 11 years ago
  71. 819239e Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" by Etienne Le Grand · 11 years ago
  72. bdfe384 am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor by Etienne Le Grand · 11 years ago
  73. 8e2a4b5 am 4ed27328: am dc97144b: Merge "Always call super.onCreate(). Always." by Nick Kralevich · 11 years ago
  74. fd53d83 Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor by Etienne Le Grand · 11 years ago
  75. 4ed2732 am dc97144b: Merge "Always call super.onCreate(). Always." by Nick Kralevich · 11 years ago
  76. dc97144 Merge "Always call super.onCreate(). Always." by Nick Kralevich · 11 years ago
  77. 5eab368 Always call super.onCreate(). Always. by Christopher Tate · 11 years ago
  78. 5a7468f DO NOT MERGE Fix several bad function definitions. by Narayan Kamath · 11 years ago
  79. de4fede am 8e63696a: am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs by Katie McCormick · 11 years ago
  80. 8e63696 am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs by Katie McCormick · 11 years ago
  81. f7bffe7 am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs by Katie McCormick · 11 years ago
  82. fc8ea92 Merge "Doc Update: notification bug fix." into klp-docs by Katie McCormick · 11 years ago
  83. 507c9fd Doc Update: notification bug fix. by Katie McCormick · 11 years ago
  84. 642421a am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev by John Spurlock · 11 years ago
  85. 5c31e48 Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev by John Spurlock · 11 years ago
  86. 6c19129 Introduce new UI_MODE_TYPE_WATCH and qualifier. by John Spurlock · 11 years ago
  87. 8f81d29 am d10b6543: am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs by Ricardo Cervera · 11 years ago
  88. d10b654 am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs by Ricardo Cervera · 11 years ago
  89. 1ac6519 am c31bd52d: am a821af68: am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs by Ricardo Cervera · 11 years ago
  90. 5df8252 am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs by Ricardo Cervera · 11 years ago
  91. ff3d89c Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs by Ricardo Cervera · 11 years ago
  92. c31bd52 am a821af68: am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs by Ricardo Cervera · 11 years ago
  93. a821af6 am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs by Ricardo Cervera · 11 years ago
  94. 90a5f98 docs: Added permissions note for Context.getFilesDir. Bug: 13716053 by Ricardo Cervera · 11 years ago
  95. 715139a Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs by Ricardo Cervera · 11 years ago
  96. c6d4a46 am 13d49e9f: am e2bdd6ae: am 6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs by Ricardo Cervera · 11 years ago
  97. 13d49e9 am e2bdd6ae: am 6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs by Ricardo Cervera · 11 years ago
  98. e2bdd6a am 6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs by Ricardo Cervera · 11 years ago
  99. 6ae21ea Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs by Ricardo Cervera · 11 years ago
  100. 7f427b4 docs: Fixed action bar example. Bug: 13806963 by Ricardo Cervera · 11 years ago