Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / da6b9599c77230c689d63e32ca80b62f60f18c27
  1. da6b959 Merge "Import translations. DO NOT MERGE" into klp-modular-dev by Baligh Uddin · 11 years ago
  2. 2e8a2d2 Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev by Zhihai Xu · 11 years ago
  3. 8d31358 Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev by Jesse Gunsch · 11 years ago
  4. cc68cc9 LE: Return false if an attribute read/write is in progress by Andre Eisenbach · 11 years ago
  5. f7d65ae Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  6. 7289f3a Merge "Move certain internal activity manager methods to new class." into klp-modular-dev by Jeff Brown · 11 years ago
  7. ea72cdf Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev by Jeff Brown · 11 years ago
  8. 13014b5 Move certain internal activity manager methods to new class. by Jeff Brown · 11 years ago
  9. ad9ef19 Move display power controller to display manager service. (DO NOT MERGE) by Jeff Brown · 11 years ago
  10. 8e5df44 Merge "NsdService does not clean up after exiting clients" by Dave Platt · 11 years ago
  11. bd6c557 Merge "DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime." into klp-modular-dev by Adam Hampson · 11 years ago
  12. 0cf836a Merge "Import translations. DO NOT MERGE" into klp-modular-dev by Baligh Uddin · 11 years ago
  13. c742215 DO NOT MERGE Remove java.io.tmpdir assignment in AndroidRuntime. by Narayan Kamath · 11 years ago
  14. ce802f48 Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev by Adam Hampson · 11 years ago
  15. 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
  16. 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
  17. 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
  18. 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
  19. 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
  20. 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
  21. 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
  22. 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
  23. 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
  24. 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
  25. 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
  26. 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
  27. 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
  28. 2c90609 am 339cfdbd: am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  29. 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
  30. 339cfdb am 72f9b308: am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  31. 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
  32. 72f9b30 am 4bc58bd2: am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  33. e42ce67 am ebf23a8d: am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev by Robert Greenwalt · 11 years ago
  34. 4bc58bd am c0d94e7a: am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  35. c0d94e7 am f52d1a56: am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  36. ebf23a8 am 74acf23a: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev by Robert Greenwalt · 11 years ago
  37. f52d1a5 am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs by Robert Greenwalt · 11 years ago
  38. 74acf23 am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev by Robert Greenwalt · 11 years ago
  39. 3c417fb Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev by Robert Greenwalt · 11 years ago
  40. c4a80ac Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  41. 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
  42. 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
  43. 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
  44. 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
  45. 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
  46. 5a7468f DO NOT MERGE Fix several bad function definitions. by Narayan Kamath · 11 years ago
  47. 8e63696 am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs by Katie McCormick · 11 years ago
  48. f7bffe7 am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs by Katie McCormick · 11 years ago
  49. fc8ea92 Merge "Doc Update: notification bug fix." into klp-docs by Katie McCormick · 11 years ago
  50. 507c9fd Doc Update: notification bug fix. by Katie McCormick · 11 years ago
  51. 5c31e48 Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev by John Spurlock · 11 years ago
  52. 6c19129 Introduce new UI_MODE_TYPE_WATCH and qualifier. by John Spurlock · 11 years ago
  53. d10b654 am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs by Ricardo Cervera · 11 years ago
  54. 5df8252 am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs by Ricardo Cervera · 11 years ago
  55. ff3d89c Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs by Ricardo Cervera · 11 years ago
  56. c31bd52 am a821af68: am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs by Ricardo Cervera · 11 years ago
  57. a821af6 am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs by Ricardo Cervera · 11 years ago
  58. 90a5f98 docs: Added permissions note for Context.getFilesDir. Bug: 13716053 by Ricardo Cervera · 11 years ago
  59. 715139a Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs by Ricardo Cervera · 11 years ago
  60. 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
  61. e2bdd6a am 6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs by Ricardo Cervera · 11 years ago
  62. 6ae21ea Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs by Ricardo Cervera · 11 years ago
  63. 7f427b4 docs: Fixed action bar example. Bug: 13806963 by Ricardo Cervera · 11 years ago
  64. 8866eb8 am c23ab90c: am 07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug: 13767801 by Ricardo Cervera · 11 years ago
  65. c23ab90 am 07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug: 13767801 by Ricardo Cervera · 11 years ago
  66. 87210ee am b2856041: (-s ours) am 81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  67. ab0c43a am 15fdce9d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev by Baligh Uddin · 11 years ago
  68. b2856041 am 81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  69. 15fdce9 Merge "Import translations. DO NOT MERGE" into klp-ub-dev by Baligh Uddin · 11 years ago
  70. 81e62eb Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  71. 53ccdf1 am ef5caff8: am c0086ba5: am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  72. 5f9887e am e18ae130: am 0bb7ec7e: am d8b890da: (-s ours) am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  73. 3e4aebd am eca9620e: am 0c44762f: am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  74. 2deb31f am f1973ae2: am a1cca5cb: am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  75. 6acadeb am 74ad989d: am 77596103: am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  76. a534664 am 14dee803: am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  77. ef5caff am c0086ba5: am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  78. e18ae13 am 0bb7ec7e: am d8b890da: (-s ours) am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  79. eca9620 am 0c44762f: am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  80. f1973ae am a1cca5cb: am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  81. 74ad989 am 77596103: am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  82. 14dee80 am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  83. c0086ba am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  84. 0bb7ec7 am d8b890da: (-s ours) am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  85. 0c44762 am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  86. a1cca5c am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  87. 7759610 am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  88. c7fdfe6 am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  89. 9bcfee1 am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  90. d8b890d am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  91. 8152502 am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  92. 29b4986 am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  93. ce39337 am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  94. 99939cc am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  95. 30e5913 am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  96. af60289 am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  97. 07d5f94 am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  98. 5c77c12 am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  99. ef9f304 am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago
  100. 6094daa am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev by Deepanshu Gupta · 11 years ago