Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 3fe668a015fffe0d5ed364f84d44ce028fab3e01
  1. 3fe668a resolve merge conflicts of 180f4ee7f78e to master by Geoffrey Pitsch · 8 years ago
  2. 180f4ee Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-mr1-dev by Geoffrey Pitsch · 8 years ago
  3. 2d33563 Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-mr1-dev by TreeHugger Robot · 8 years ago
  4. 75e7ee9 Merge "Fixing TaskPersisterTest" into oc-dr1-dev am: 928aad3e4d am: e7e68b8991 by Suprabh Shukla · 8 years ago
  5. 301f23d Merge "Fixing TaskPersisterTest" into oc-dr1-dev am: 928aad3e4d am: ab0e78c4b4 by Suprabh Shukla · 8 years ago
  6. 5f86e9f Merge "Fixing TaskPersisterTest" into oc-dr1-dev am: 928aad3e4d am: e7e68b8991 by Suprabh Shukla · 8 years ago
  7. 023dbcd Merge "Fixing TaskPersisterTest" into oc-dr1-dev am: 928aad3e4d am: ab0e78c4b4 by Suprabh Shukla · 8 years ago
  8. e7e68b8 Merge "Fixing TaskPersisterTest" into oc-dr1-dev am: 928aad3e4d by Suprabh Shukla · 8 years ago
  9. ab0e78c Merge "Fixing TaskPersisterTest" into oc-dr1-dev am: 928aad3e4d by Suprabh Shukla · 8 years ago
  10. 928aad3 Merge "Fixing TaskPersisterTest" into oc-dr1-dev by TreeHugger Robot · 8 years ago
  11. e3ccfd7 Merge "IpManagerTest: fix flaky test for real" am: e0a743d035 am: 3d423c9c39 am: 8b8a0ef586 am: 34ad34d199 by Hugo Benichi · 8 years ago
  12. eff89fc Merge "IpManagerTest: fix flaky test for real" am: e0a743d035 am: 3d423c9c39 am: 8b8a0ef586 by Hugo Benichi · 8 years ago
  13. 34ad34d Merge "IpManagerTest: fix flaky test for real" am: e0a743d035 am: 3d423c9c39 by Hugo Benichi · 8 years ago
  14. 8b8a0ef Merge "IpManagerTest: fix flaky test for real" am: e0a743d035 am: 3d423c9c39 by Hugo Benichi · 8 years ago
  15. 3d423c9 Merge "IpManagerTest: fix flaky test for real" am: e0a743d035 by Hugo Benichi · 8 years ago
  16. 89e4c1c Merge "Refactor TextUtils.join() and add documentation" by TreeHugger Robot · 8 years ago
  17. e0a743d0 Merge "IpManagerTest: fix flaky test for real" by Treehugger Robot · 8 years ago
  18. 2b65b129 Merge "Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe" into oc-mr1-dev am: 5f927337c0" into oc-mr1-dev-plus-aosp by Amith Yamasani · 8 years ago
  19. 52f61a2 Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe am: 30f2df2f34" into oc-mr1-dev-plus-aosp by Amith Yamasani · 8 years ago
  20. 6a60930 Merge "[P2P] Public API to clean-up resources of P2P" into oc-mr1-dev am: dde0e6ad21 by Etan Cohen · 8 years ago
  21. 55e5078 Merge "Merge "NFC DTA Integration" into oc-dr1-dev am: f8469ccf17 am: 1e43a74a47" into oc-mr1-dev-plus-aosp by Love Khanna · 8 years ago
  22. e8977e9 Merge "Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe" into oc-mr1-dev am: 5f927337c0" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  23. d1496ec Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe am: 30f2df2f34" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  24. 952d173 Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe" into oc-mr1-dev by Amith Yamasani · 8 years ago
  25. 6b2fb28 Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe by Amith Yamasani · 8 years ago
  26. fae8a90 Merge "NFC DTA Integration" into oc-dr1-dev am: f8469ccf17 am: 1d3929d46a by Love Khanna · 8 years ago
  27. ee58159 Merge "[P2P] Public API to clean-up resources of P2P" into oc-mr1-dev by Etan Cohen · 8 years ago
  28. 04f7602 Merge "Merge "NFC DTA Integration" into oc-dr1-dev am: f8469ccf17 am: 1e43a74a47" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  29. 5f92733 Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe" into oc-mr1-dev by Android Build Merger (Role) · 8 years ago
  30. 30f2df2 Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev by Amith Yamasani · 8 years ago
  31. d206755 Merge "NFC DTA Integration" into oc-dr1-dev am: f8469ccf17 am: 1d3929d46a by Love Khanna · 8 years ago
  32. fc923bb Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev by Amith Yamasani · 8 years ago
  33. 58d44ad Merge "NFC DTA Integration" into oc-dr1-dev am: f8469ccf17 am: 1e43a74a47 by Love Khanna · 8 years ago
  34. e9bdc19 IpManagerTest: fix flaky test for real by Hugo Benichi · 8 years ago
  35. dde0e6a Merge "[P2P] Public API to clean-up resources of P2P" into oc-mr1-dev by TreeHugger Robot · 8 years ago
  36. 1d3929d Merge "NFC DTA Integration" into oc-dr1-dev am: f8469ccf17 by Love Khanna · 8 years ago
  37. 1e43a74 Merge "NFC DTA Integration" into oc-dr1-dev am: f8469ccf17 by Love Khanna · 8 years ago
  38. 6b4f0bb Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev by TreeHugger Robot · 8 years ago
  39. f8469cc Merge "NFC DTA Integration" into oc-dr1-dev by TreeHugger Robot · 8 years ago
  40. 19d8565 Merge "Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am: 860f185c66 am: ed005b2928" into oc-mr1-dev-plus-aosp by Glen Kuhne · 8 years ago
  41. a8b74c8 Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am: 860f185c66 am: 640f04ef38 by Glen Kuhne · 8 years ago
  42. 7df3410 Merge "Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am: 860f185c66 am: ed005b2928" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  43. e96e42b Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am: 860f185c66 by Glen Kuhne · 8 years ago
  44. d6d285e Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev am: 860f185c66 by Glen Kuhne · 8 years ago
  45. 640f04e Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev by Glen Kuhne · 8 years ago
  46. ed005b2 Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev by Glen Kuhne · 8 years ago
  47. 860f185 Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev by TreeHugger Robot · 8 years ago
  48. 7edc610 Merge "Merge "Do not clear scores during stopTracking." into oc-dr1-dev am: 3b63aa79eb am: 06a6d6bbed" into oc-mr1-dev-plus-aosp by Sundeep Ghuman · 8 years ago
  49. 37d8ea3 Merge "Do not clear scores during stopTracking." into oc-dr1-dev am: 3b63aa79eb am: 34df6c0af3 by Sundeep Ghuman · 8 years ago
  50. e2f98d2 Merge "Merge "Do not clear scores during stopTracking." into oc-dr1-dev am: 3b63aa79eb am: 06a6d6bbed" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  51. e4e3419 Merge "Do not clear scores during stopTracking." into oc-dr1-dev am: 3b63aa79eb by Sundeep Ghuman · 8 years ago
  52. e2af703 Merge "Do not clear scores during stopTracking." into oc-dr1-dev am: 3b63aa79eb by Sundeep Ghuman · 8 years ago
  53. 06a6d6b Merge "Do not clear scores during stopTracking." into oc-dr1-dev am: 3b63aa79eb by Sundeep Ghuman · 8 years ago
  54. 34df6c0 Merge "Do not clear scores during stopTracking." into oc-dr1-dev am: 3b63aa79eb by Sundeep Ghuman · 8 years ago
  55. c71c832 Merge "Use the Context's locale in DateFormat" by TreeHugger Robot · 8 years ago
  56. 3b63aa7 Merge "Do not clear scores during stopTracking." into oc-dr1-dev by TreeHugger Robot · 8 years ago
  57. 51bd66d Merge "Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev am: a363ab9d6f am: 82bc67193d" into oc-mr1-dev-plus-aosp by Winson Chung · 8 years ago
  58. 1b22a6a Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev am: a363ab9d6f am: 65d5b0b93d by Winson Chung · 8 years ago
  59. 42673c3 Refactor TextUtils.join() and add documentation by Roozbeh Pournader · 8 years ago
  60. 7abb962 Merge "Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev am: a363ab9d6f am: 82bc67193d" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  61. 21bc18f Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev am: a363ab9d6f by Winson Chung · 8 years ago
  62. 3270c21 Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev am: a363ab9d6f by Winson Chung · 8 years ago
  63. 65d5b0b Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev by Winson Chung · 8 years ago
  64. 82bc671 Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev by Winson Chung · 8 years ago
  65. a363ab9 Merge "Apply static offset to PiP IME adjustment." into oc-dr1-dev by Winson Chung · 8 years ago
  66. 7d97b91 Merge "Support font resource in TextAppearanceSpan" by TreeHugger Robot · 8 years ago
  67. eba529b Merge "Data plan setting in SystemUI quick settings." by Rajeev Kumar · 8 years ago
  68. 755a8fa NFC DTA Integration by Love Khanna · 8 years ago
  69. eff6ae0 Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am: 37a9991be9 am: f4292bacf9 by Amit Mahajan · 8 years ago
  70. e02ce08 Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am: 37a9991be9 am: d57fcca823 by Amit Mahajan · 8 years ago
  71. 3a6bfc6 Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am: 37a9991be9 by Amit Mahajan · 8 years ago
  72. df69227 Merge "Merge "Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am: 2ed613ca80 am: 8b1a5af473" into oc-mr1-dev-plus-aosp am: 6f62fe1adc" by Android Build Merger (Role) · 8 years ago
  73. 3f8c9e4 Merge "Media API: fix possible NPE" by TreeHugger Robot · 8 years ago
  74. 743f4f8 Merge "Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am: 2ed613ca80 am: 8b1a5af473" into oc-mr1-dev-plus-aosp by Selim Cinek · 8 years ago
  75. 7b2fac8 Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am: 37a9991be9 by Amit Mahajan · 8 years ago
  76. 291672c Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am: 2ed613ca80 am: 0d7ff5328e by Selim Cinek · 8 years ago
  77. db8167e Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev am: 0b8a985cd6 am: f86be8d22d by Mady Mellor · 8 years ago
  78. 3e4bf84 Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev am: 0b8a985cd6 am: dbb5c98423 by Mady Mellor · 8 years ago
  79. d57fcca8 Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev by Amit Mahajan · 8 years ago
  80. f4292ba Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev by Amit Mahajan · 8 years ago
  81. 6f62fe1 Merge "Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am: 2ed613ca80 am: 8b1a5af473" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  82. fe76e30 Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am: 2ed613ca80 by Selim Cinek · 8 years ago
  83. ae74e8d Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev am: 2ed613ca80 by Selim Cinek · 8 years ago
  84. 74bf71b Handle an edge case that can reset settings provider data by Amith Yamasani · 8 years ago
  85. 37a9991 Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev by Amit Mahajan · 8 years ago
  86. 0c574f70 Merge "Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev am: 99cc683647 am: e7faf1a975" into oc-mr1-dev-plus-aosp by Adrian Roos · 8 years ago
  87. 5cd07d5 Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev am: 0b8a985cd6 by Mady Mellor · 8 years ago
  88. 0ca8adc Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev am: 99cc683647 am: 74f09cff14 by Adrian Roos · 8 years ago
  89. 0d7ff53 Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev by Selim Cinek · 8 years ago
  90. 8b1a5af Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev by Selim Cinek · 8 years ago
  91. e95503d Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev am: 0b8a985cd6 by Mady Mellor · 8 years ago
  92. a4869c7 Merge "Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev am: 99cc683647 am: e7faf1a975" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  93. f86be8d Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev by Mady Mellor · 8 years ago
  94. 3488db7 Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev am: 99cc683647 by Adrian Roos · 8 years ago
  95. dbb5c98 Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev by Mady Mellor · 8 years ago
  96. 2ed613c Merge "Clipping the last notification if it's in the shelf" into oc-dr1-dev by TreeHugger Robot · 8 years ago
  97. 7615b87b Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev am: 99cc683647 by Adrian Roos · 8 years ago
  98. 74f09cf Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev by Adrian Roos · 8 years ago
  99. e7faf1a Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev by Adrian Roos · 8 years ago
  100. 1057ec5 Merge "Only display RSSI/band information if network is connected." by TreeHugger Robot · 8 years ago