Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 94a7d5bfcfd51c1b1dcc746da214d19033d58df2
  1. 94a7d5b Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  2. 79f50d6 Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 by Erik Kline · 8 years ago
  3. 462232a Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 by Erik Kline · 8 years ago
  4. aa9d12f Merge "Clearly log tether_offload_disabled setting status in start()" by Erik Kline · 8 years ago
  5. b171a46 Merge "Clearly log tether_offload_disabled setting status in start()" by Treehugger Robot · 8 years ago
  6. d34b2a9 Clearly log tether_offload_disabled setting status in start() by Erik Kline · 8 years ago
  7. f9d6155 Merge "Merge "Merge "ProcessStats: fix uss average value offset" am: b355b7f446" into stage-aosp-master am: e62a5fc7d3" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  8. d587e80 Merge "Merge "ProcessStats: fix uss average value offset" am: b355b7f446" into stage-aosp-master by Mathieu Chartier · 8 years ago
  9. b4efa15 Merge "Merge "ProcessStats: fix uss average value offset" am: b355b7f446 am: 10f5f8dde5" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  10. 9bce62d Merge "ProcessStats: fix uss average value offset" am: b355b7f446 am: 10f5f8dde5 by Mathieu Chartier · 8 years ago
  11. 94edf02 Merge "ProcessStats: fix uss average value offset" am: b355b7f446 am: 10f5f8dde5 by Mathieu Chartier · 8 years ago
  12. e62a5fc Merge "Merge "ProcessStats: fix uss average value offset" am: b355b7f446" into stage-aosp-master by Android Build Merger (Role) · 8 years ago
  13. 3414a3f Merge "ProcessStats: fix uss average value offset" am: b355b7f446 by Mathieu Chartier · 8 years ago
  14. 10f5f8d Merge "ProcessStats: fix uss average value offset" am: b355b7f446 by Mathieu Chartier · 8 years ago
  15. b355b7f Merge "ProcessStats: fix uss average value offset" by Mathieu Chartier · 8 years ago
  16. d0d8125 Merge "Merge "Merge "Update DownloadRequest API" am: fa42eea98f" into stage-aosp-master am: 809edde8fd" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  17. 7fc2603 Merge "Merge "Update DownloadRequest API" am: fa42eea98f" into stage-aosp-master by Hall Liu · 8 years ago
  18. 8f35f91 Merge "Merge "Update DownloadRequest API" am: fa42eea98f" into stage-aosp-master by Hall Liu · 8 years ago
  19. 812d086 Merge "Update DownloadRequest API" am: fa42eea98f am: 5e7c98bb6a by Hall Liu · 8 years ago
  20. 809edde Merge "Merge "Update DownloadRequest API" am: fa42eea98f" into stage-aosp-master by Android Build Merger (Role) · 8 years ago
  21. 5e7c98b Merge "Update DownloadRequest API" am: fa42eea98f by Hall Liu · 8 years ago
  22. 31acadb Merge "Update DownloadRequest API" am: fa42eea98f by Hall Liu · 8 years ago
  23. bdbe454 Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc" into stage-aosp-master am: 17f2f1633b" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  24. c70a13f Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc" into stage-aosp-master by Hiroki Yamamoto · 8 years ago
  25. 808ae63 Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc am: 1a6d0d753e" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  26. 5a9226f Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc by Hiroki Yamamoto · 8 years ago
  27. 3ccfa35 Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc by Hiroki Yamamoto · 8 years ago
  28. fa42eea Merge "Update DownloadRequest API" by Hall Liu · 8 years ago
  29. 17f2f16 Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc" into stage-aosp-master by Android Build Merger (Role) · 8 years ago
  30. d80f025 Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" by Hiroki Yamamoto · 8 years ago
  31. 1a6d0d7 Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" by Hiroki Yamamoto · 8 years ago
  32. 21187ba Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" by Treehugger Robot · 8 years ago
  33. 41d52b1 Merge "Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94" into stage-aosp-master am: 6340d93571" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  34. 7b33532 Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94" into stage-aosp-master by Erik Kline · 8 years ago
  35. c8505e4 Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 am: 5ba953cbe9" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  36. e591294 Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 by Erik Kline · 8 years ago
  37. 8c72e18 Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 by Erik Kline · 8 years ago
  38. 6340d93 Merge "Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94" into stage-aosp-master by Android Build Merger (Role) · 8 years ago
  39. 7ba301e Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 by Erik Kline · 8 years ago
  40. 5ba953c Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 by Erik Kline · 8 years ago
  41. 36904fbc Merge "Better logging infrastructure in OffloadHardwareInterface" by Treehugger Robot · 8 years ago
  42. 506350b Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover by Hiroki Yamamoto · 8 years ago
  43. 313d31a Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  44. a21fe01 Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master by Tobias Thierer · 8 years ago
  45. 81d0134 Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 4e4b5a2426" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  46. 6a9d07e Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 93cc3d86ad" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  47. 6309833 Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master by Tobias Thierer · 8 years ago
  48. d01571b Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 93cc3d86ad" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  49. ba769ec Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master by Tobias Thierer · 8 years ago
  50. 8bbf3ca Merge "Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master am: 42d194ee03" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  51. cff9748 Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master by Tobias Thierer · 8 years ago
  52. 1da7397 Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master by Andreas Gampe · 8 years ago
  53. a94db9f Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master by Andreas Gampe · 8 years ago
  54. 3255899 Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56 am: f70270f94a" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  55. 4e4b5a2 Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master by Android Build Merger (Role) · 8 years ago
  56. f3ee8c6 Merge "Framework: Add libziparchive dependency" am: 2688a9ab56 am: f70270f94a by Andreas Gampe · 8 years ago
  57. 14d3dec Merge "Framework: Add libziparchive dependency" am: 2688a9ab56 am: f70270f94a by Andreas Gampe · 8 years ago
  58. 93cc3d8 Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master by Android Build Merger (Role) · 8 years ago
  59. b784e06e Merge "Track update of org.json API" am: c5a65bc152 by Tobias Thierer · 8 years ago
  60. ddffcdb Merge "Track update of org.json API" am: c5a65bc152 by Tobias Thierer · 8 years ago
  61. 42d194e Merge "Merge "Framework: Add libziparchive dependency" am: 2688a9ab56" into stage-aosp-master by Android Build Merger (Role) · 8 years ago
  62. 0679aad Merge "Framework: Add libziparchive dependency" am: 2688a9ab56 by Andreas Gampe · 8 years ago
  63. f70270f Merge "Framework: Add libziparchive dependency" am: 2688a9ab56 by Andreas Gampe · 8 years ago
  64. c5a65bc Merge "Track update of org.json API" by Tobias Thierer · 8 years ago
  65. 2688a9a Merge "Framework: Add libziparchive dependency" by Treehugger Robot · 8 years ago
  66. 530a622 Merge "Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265 -s ours" into stage-aosp-master am: a998cffb1b -s ours" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  67. 207b71a Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265 -s ours" into stage-aosp-master by Adam Lesinski · 8 years ago
  68. eb20c5a Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265 -s ours am: 1ebe18d691 -s ours" into oc-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  69. 8876673 Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265 -s ours by Adam Lesinski · 8 years ago
  70. 8f09557 Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265 -s ours by Adam Lesinski · 8 years ago
  71. a998cff Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265 -s ours" into stage-aosp-master by Android Build Merger (Role) · 8 years ago
  72. 8253774 Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" by Adam Lesinski · 8 years ago
  73. 1ebe18d Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" by Adam Lesinski · 8 years ago
  74. 6fd0671 Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" by Treehugger Robot · 8 years ago
  75. e5a7626 Framework: Add libziparchive dependency by Andreas Gampe · 8 years ago
  76. e366fa0 Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6 by Adam Lesinski · 9 years ago
  77. a3f3bd1 Better logging infrastructure in OffloadHardwareInterface by Erik Kline · 8 years ago
  78. 0278aa4 Merge "ConnectivityManager: allow usage of TYPE_NONE" am: 279f32ded5 by Hugo Benichi · 8 years ago
  79. 0537f16 Merge "ConnectivityManager: allow usage of TYPE_NONE" am: 279f32ded5 by Hugo Benichi · 8 years ago
  80. 14f400c Merge "ConnectivityServiceTest: more informative assert failures" am: 04d8a730a9 by Hugo Benichi · 8 years ago
  81. 279f32d Merge "ConnectivityManager: allow usage of TYPE_NONE" by Treehugger Robot · 8 years ago
  82. 0a7f5cc Merge "ConnectivityServiceTest: more informative assert failures" am: 04d8a730a9 by Hugo Benichi · 8 years ago
  83. 04d8a73 Merge "ConnectivityServiceTest: more informative assert failures" by Treehugger Robot · 8 years ago
  84. 80bc56b Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: 66788dc4d8 by Hugo Benichi · 8 years ago
  85. 2d452e6 Merge "ConnectivityServiceTest: eliminate remaining sleep()" am: 66788dc4d8 by Hugo Benichi · 8 years ago
  86. 16f0a94 ConnectivityManager: allow usage of TYPE_NONE by Hugo Benichi · 8 years ago
  87. fed512a ConnectivityServiceTest: more informative assert failures by Hugo Benichi · 8 years ago
  88. 66788dc Merge "ConnectivityServiceTest: eliminate remaining sleep()" by Hugo Benichi · 8 years ago
  89. 53e5c05 DO NOT MERGE ANYWHERE by Erik Kline · 8 years ago
  90. c99ff3a resolve merge conflicts of b1eb85c9a8d3 to stage-aosp-master am: dbc7279e85 by Erik Kline · 8 years ago
  91. dbc7279 resolve merge conflicts of b1eb85c9a8d3 to stage-aosp-master by Erik Kline · 8 years ago
  92. 91c7ff9 ConnectivityServiceTest: eliminate remaining sleep() by Hugo Benichi · 8 years ago
  93. b1eb85c Merge "Switch to USB_CONFIGURED as the primary USB readiness signal" by Treehugger Robot · 8 years ago
  94. 2dce771 Switch to USB_CONFIGURED as the primary USB readiness signal by Erik Kline · 8 years ago
  95. 61be696 Switch to USB_CONFIGURED as the primary USB readiness signal by Erik Kline · 8 years ago
  96. bdcebe3 Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am: 10c314e19a by Roland Levillain · 8 years ago
  97. 3b2b9b6 Merge "Revert "ConnectivityServiceTest: more informative assert failures"" am: d10790c902 by Roland Levillain · 8 years ago
  98. d3f26b6 Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" am: 10c314e19a by Roland Levillain · 8 years ago
  99. a3909e0 Merge "Revert "ConnectivityServiceTest: eliminate remaining sleep()"" am: 1e3624527b by Roland Levillain · 8 years ago
  100. 8f68232 Merge "Revert "ConnectivityServiceTest: more informative assert failures"" by Roland Levillain · 8 years ago