Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / c840945a7809b1fd55621d107ce799d8af370744
  1. c840945 Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 by Steven Moreland · 7 years ago
  2. 5c091dc Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 by Steven Moreland · 7 years ago
  3. 826eafd Merge "frameworks/base: use proper nativehelper headers" by Treehugger Robot · 7 years ago
  4. 12286b2 Merge "Add details to Download progress callback" am: b440b572d7 am: 5f047a68d9 by Robert Greenwalt · 7 years ago
  5. 5f047a6 Merge "Add details to Download progress callback" am: b440b572d7 by Robert Greenwalt · 7 years ago
  6. b440b57 Merge "Add details to Download progress callback" by Treehugger Robot · 7 years ago
  7. af3d7f9 Merge "Add timezone for Telecom event date formatting" am: bf296640e6 by Hall Liu · 7 years ago
  8. 5af5994 Merge "Add timezone for Telecom event date formatting" am: bf296640e6 by Hall Liu · 7 years ago
  9. bf29664 Merge "Add timezone for Telecom event date formatting" by Treehugger Robot · 7 years ago
  10. 0ebff46 Add details to Download progress callback by Robert Greenwalt · 7 years ago
  11. b6643ac Add timezone for Telecom event date formatting by Hall Liu · 7 years ago
  12. c6c395b Merge "Fix static analyzer complaints" am: a3bde81205 am: 3e0a8b1d2b by George Burgess IV · 7 years ago
  13. 3e0a8b1 Merge "Fix static analyzer complaints" am: a3bde81205 by George Burgess IV · 7 years ago
  14. a3bde81 Merge "Fix static analyzer complaints" by Treehugger Robot · 7 years ago
  15. 2279b25 frameworks/base: use proper nativehelper headers by Steven Moreland · 7 years ago
  16. 263e833 Merge "Adding 26 free short codes for DCB and other purposes" am: 1585b2e7b7 by Carlos Vinueza · 7 years ago
  17. 3a6a8b9 Merge "Adding 26 free short codes for DCB and other purposes" am: 1585b2e7b7 by Carlos Vinueza · 7 years ago
  18. 1585b2e Merge "Adding 26 free short codes for DCB and other purposes" by Treehugger Robot · 7 years ago
  19. 450c3bc Merge "Re-enable some test cases" am: 8feaad7249 am: a76d88d26d by Neil Fuller · 7 years ago
  20. a76d88d Merge "Re-enable some test cases" am: 8feaad7249 by Neil Fuller · 7 years ago
  21. 8feaad7 Merge "Re-enable some test cases" by Neil Fuller · 7 years ago
  22. b1894ab Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" am: 24a2adfa27 by Hugo Benichi · 7 years ago
  23. f688350 Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" am: 24a2adfa27 by Hugo Benichi · 7 years ago
  24. 24a2adf Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" by Treehugger Robot · 7 years ago
  25. c101450 ConnectivityServiceTest: fix testNetworkInfoOfTypeNone by Hugo Benichi · 7 years ago
  26. 04b4807 Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev by Ricardo Loo · 7 years ago
  27. 8e644a7 Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev by Ricardo Loo · 7 years ago
  28. 6b9d4b7 Reference nativehelper/jni.h as jni.h am: d82cdb4624 by Steven Moreland · 7 years ago
  29. d82cdb4 Reference nativehelper/jni.h as jni.h by Steven Moreland · 7 years ago
  30. 6ba27f0 Merge "Merge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc3458d am: a84f7a3028 am: 72c56fb84a -s ours am: ea6aaed42d" into oc-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  31. da44103 Merge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc3458d am: a84f7a3028 am: 72c56fb84a -s ours by Phil Weaver · 7 years ago
  32. fe88fa9 Merge "IpManager: fix test for default ProvisioningConfiguration" am: 2627d4856b by Hugo Benichi · 7 years ago
  33. ea6aaed Merge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc3458d am: a84f7a3028 by Phil Weaver · 7 years ago
  34. 361162b Merge "IpManager: fix test for default ProvisioningConfiguration" am: 2627d4856b by Hugo Benichi · 7 years ago
  35. 72c56fb Merge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc3458d by Phil Weaver · 7 years ago
  36. 2627d48 Merge "IpManager: fix test for default ProvisioningConfiguration" by Treehugger Robot · 7 years ago
  37. a84f7a3 Merge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc3458d by Phil Weaver · 7 years ago
  38. ad737af Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12 -s ours am: 9e39e1e548 am: afdcad0df3 am: edbe4bd86a am: 2da30457c5 am: d761dad216 by Phil Weaver · 7 years ago
  39. 4a1dc34 Merge "Back-port fixes for b/62196835" into nyc-mr1-dev by Phil Weaver · 7 years ago
  40. a81076b Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12 -s ours am: 9e39e1e548 am: afdcad0df3 am: edbe4bd86a am: 2da30457c5 by Phil Weaver · 7 years ago
  41. d761dad Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12 -s ours am: 9e39e1e548 am: afdcad0df3 am: edbe4bd86a by Phil Weaver · 7 years ago
  42. 2da3045 Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12 -s ours am: 9e39e1e548 am: afdcad0df3 by Phil Weaver · 7 years ago
  43. edbe4bd Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12 -s ours am: 9e39e1e548 by Phil Weaver · 7 years ago
  44. afdcad0 Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12 -s ours by Phil Weaver · 7 years ago
  45. 9e39e1e Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 by Phil Weaver · 7 years ago
  46. dbc7850 Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" am: 777c408a22 by Robert Quattlebaum · 7 years ago
  47. c3cc786 Merge "GC in heapDumpFinished to cleanup hprof fd" am: f126c41de7 am: 8e82bc9961 by Billy Lam · 7 years ago
  48. 996bc6b Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 by Phil Weaver · 7 years ago
  49. 6a5fe34 resolve merge conflicts of a1d67fb38ec0 to stage-aosp-master am: 8228eb3446 by Lorenzo Colitti · 7 years ago
  50. 9625d16 Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 by Phil Weaver · 7 years ago
  51. 6b0e694 Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" am: 777c408a22 by Robert Quattlebaum · 7 years ago
  52. 8e82bc9 Merge "GC in heapDumpFinished to cleanup hprof fd" am: f126c41de7 by Billy Lam · 7 years ago
  53. 0ddd7e4 Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 by Phil Weaver · 7 years ago
  54. 093c7a8 Merge "Back-port fixes for b/62196835" into mnc-dev by Phil Weaver · 7 years ago
  55. 777c408 Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" by Treehugger Robot · 7 years ago
  56. 8228eb3 resolve merge conflicts of a1d67fb38ec0 to stage-aosp-master by Lorenzo Colitti · 7 years ago
  57. f947a12 Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours am: 2a93c3d390 am: fef2328f35 am: 713a5420dd by Phil Weaver · 7 years ago
  58. f126c41 Merge "GC in heapDumpFinished to cleanup hprof fd" by Treehugger Robot · 7 years ago
  59. 41ff5389 Back-port fixes for b/62196835 by Phil Weaver · 7 years ago
  60. 80c2eee Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours am: 2a93c3d390 am: fef2328f35 by Phil Weaver · 7 years ago
  61. 713a542 Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours am: 2a93c3d390 by Phil Weaver · 7 years ago
  62. fd3f7f3 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f am: ac700bc3c7 am: cfbe89ad32 -s ours by Phil Weaver · 7 years ago
  63. fef2328 Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours by Phil Weaver · 7 years ago
  64. 442fc85 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f am: ac700bc3c7 by Phil Weaver · 7 years ago
  65. ad09c7e DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db am: d2c4007d8a am: 982cf0d212 -s ours by Phil Weaver · 7 years ago
  66. 2a93c3d Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 by Phil Weaver · 7 years ago
  67. cfbe89a Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f by Phil Weaver · 7 years ago
  68. 4607ec8 DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db am: d2c4007d8a by Phil Weaver · 7 years ago
  69. 4fa8b51 Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 by Phil Weaver · 7 years ago
  70. 982cf0d DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db by Phil Weaver · 7 years ago
  71. ac700bc Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c by Phil Weaver · 7 years ago
  72. b086ea5 Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957 am: 79c476704f am: faded53018 by Phil Weaver · 7 years ago
  73. 3700014 Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957 am: 79c476704f by Phil Weaver · 7 years ago
  74. b2e3fb1 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f by Phil Weaver · 7 years ago
  75. d2c4007 DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69 by Phil Weaver · 7 years ago
  76. 0b0834f Merge "Back-port fixes for b/62196835" into nyc-dev by Phil Weaver · 7 years ago
  77. faded53 Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957 by Phil Weaver · 7 years ago
  78. 27ad1fb Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours by Phil Weaver · 7 years ago
  79. 783253f DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae by Phil Weaver · 7 years ago
  80. 79c4767 Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e by Phil Weaver · 7 years ago
  81. aa8976f DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours by Phil Weaver · 7 years ago
  82. bbb5677 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 by Phil Weaver · 7 years ago
  83. a1dca32 Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c by Phil Weaver · 7 years ago
  84. f44b48a DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d by Phil Weaver · 7 years ago
  85. 7e82d62 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 by Phil Weaver · 7 years ago
  86. b968d99 Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 by Phil Weaver · 7 years ago
  87. 83261a8 Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed by Phil Weaver · 7 years ago
  88. cf7ce06 DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb by Phil Weaver · 7 years ago
  89. 5264237 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c by Phil Weaver · 7 years ago
  90. 62eca82 Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e by Phil Weaver · 7 years ago
  91. f05a6fc DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 by Phil Weaver · 7 years ago
  92. 68f7106 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours by Phil Weaver · 7 years ago
  93. e11e076 Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 by Phil Weaver · 7 years ago
  94. 219d9b5 DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours by Phil Weaver · 7 years ago
  95. 5603b71 GC in heapDumpFinished to cleanup hprof fd by Billy Lam · 7 years ago
  96. e06843f Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours by Phil Weaver · 7 years ago
  97. 5d46833 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e by Phil Weaver · 7 years ago
  98. cd3633f Merge "Launch NetD in a different thread" am: c721dce3fc am: 709f3c1d46 by nharold · 7 years ago
  99. 76007bb DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 by Phil Weaver · 7 years ago
  100. 68efc2e Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours by Phil Weaver · 7 years ago