Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 811f10c2094bcceedcf41f7af50a5d88e3f7e31c
  1. 811f10c2 Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705" into nyc-mr1-dev-plus-aosp by Jeff Sharkey · 8 years ago
  2. d9a1804 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705 by Jeff Sharkey · 8 years ago
  3. 8493830 Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e" into nyc-mr1-dev-plus-aosp by Jeff Sharkey · 8 years ago
  4. 736acb1 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e by Jeff Sharkey · 8 years ago
  5. 195caa6 Merge "Remove static link in Android framework under /frameworks/base." am: c60963e451 am: 5705ad69db by Jaekyun Seok · 8 years ago
  6. 30aca83 Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  7. 0ae6bb6 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 by Jeff Sharkey · 8 years ago
  8. fb9a16a Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  9. ae21f6f5b Merge "Remove static link in Android framework under /frameworks/base." am: c60963e451 by Jaekyun Seok · 8 years ago
  10. 45ba859 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac by Jeff Sharkey · 8 years ago
  11. 5705ad6 Merge "Remove static link in Android framework under /frameworks/base." by Jaekyun Seok · 8 years ago
  12. a75ce3a Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e by Jeff Sharkey · 8 years ago
  13. 10cdb11 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 by Jeff Sharkey · 8 years ago
  14. c60963e Merge "Remove static link in Android framework under /frameworks/base." by Treehugger Robot · 8 years ago
  15. 07ad2a9 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 by Jeff Sharkey · 8 years ago
  16. 270d1c2 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb by Jeff Sharkey · 8 years ago
  17. f923e8c Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours am: b685f719f1 am: 45b6a52225 am: 34b87d94e4 am: 30ef1ad5be by Jeff Sharkey · 8 years ago
  18. f88aada DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f am: b4638e2d88 am: bf9a60106b by Jeff Sharkey · 8 years ago
  19. 292bee2 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours am: b685f719f1 am: 45b6a52225 am: 34b87d94e4 am: 30ef1ad5be by Jeff Sharkey · 8 years ago
  20. d40f62e DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f am: b4638e2d88 am: bf9a60106b by Jeff Sharkey · 8 years ago
  21. d1534dc Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 am: 48313052ab" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  22. 1c0d8bf Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 am: 29c335ef2e" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  23. 652521a Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours am: b685f719f1 am: 45b6a52225 am: 34b87d94e4 by Jeff Sharkey · 8 years ago
  24. 938649a Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 by Jeff Sharkey · 8 years ago
  25. 01f9f1b Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 by Jeff Sharkey · 8 years ago
  26. 8c74832 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours by Jeff Sharkey · 8 years ago
  27. d949aa9 Merge "DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d am: 9e7bd59457 am: 94b6048c4a" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  28. 5fafe8e Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours am: b685f719f1 am: 45b6a52225 am: 34b87d94e4 by Jeff Sharkey · 8 years ago
  29. 8165a22 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours by Jeff Sharkey · 8 years ago
  30. 8d9cb50 DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d am: 9e7bd59457 by Jeff Sharkey · 8 years ago
  31. 1afc4b8 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f am: b4638e2d88 by Jeff Sharkey · 8 years ago
  32. 4d80f89 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f am: b4638e2d88 by Jeff Sharkey · 8 years ago
  33. 906cec2 DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d am: 9e7bd59457 by Jeff Sharkey · 8 years ago
  34. d7e0fab4 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce am: 21d36dcc91 by Jeff Sharkey · 8 years ago
  35. 4831305 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 by Jeff Sharkey · 8 years ago
  36. 30ef1ad Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours am: b685f719f1 am: 45b6a52225 by Jeff Sharkey · 8 years ago
  37. 29c335e Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 by Jeff Sharkey · 8 years ago
  38. b155106 DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 am: 2b7584f5b1 by Jeff Sharkey · 8 years ago
  39. bf9a601 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f by Jeff Sharkey · 8 years ago
  40. 94b6048 DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d by Jeff Sharkey · 8 years ago
  41. 0040d4f DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d by Jeff Sharkey · 8 years ago
  42. aeeb9c8 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 by Jeff Sharkey · 8 years ago
  43. 34b87d9 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours am: b685f719f1 by Jeff Sharkey · 8 years ago
  44. ef5d241 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e by Jeff Sharkey · 8 years ago
  45. dc4cbfa Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce am: 21d36dcc91 by Jeff Sharkey · 8 years ago
  46. e0fe320 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a by Jeff Sharkey · 8 years ago
  47. 9e7bd59 DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b by Jeff Sharkey · 8 years ago
  48. 1fb6b55 DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 am: 2b7584f5b1 by Jeff Sharkey · 8 years ago
  49. b4638e2 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb by Jeff Sharkey · 8 years ago
  50. 45b6a52 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours by Jeff Sharkey · 8 years ago
  51. 4610805 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 by Jeff Sharkey · 8 years ago
  52. 2645047 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce by Jeff Sharkey · 8 years ago
  53. 26e6918 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d by Jeff Sharkey · 8 years ago
  54. ff703a3 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce by Jeff Sharkey · 8 years ago
  55. b88d8dc DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours by Jeff Sharkey · 8 years ago
  56. a07bcbc DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd by Jeff Sharkey · 8 years ago
  57. d8ee1d0 DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 by Jeff Sharkey · 8 years ago
  58. 37d3eec DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 by Jeff Sharkey · 8 years ago
  59. ad04786 DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 by Jeff Sharkey · 8 years ago
  60. b685f71 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev by Jeff Sharkey · 8 years ago
  61. 3f0e746 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours by Jeff Sharkey · 8 years ago
  62. 4143345 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev by Jeff Sharkey · 8 years ago
  63. bdfb26a DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 by Jeff Sharkey · 8 years ago
  64. 21d36dc Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev by Jeff Sharkey · 8 years ago
  65. 2b7584f DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 by Jeff Sharkey · 8 years ago
  66. 471812a Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev by Jeff Sharkey · 8 years ago
  67. 7340749 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd by Jeff Sharkey · 8 years ago
  68. 48f6bdf Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev by Jeff Sharkey · 8 years ago
  69. 0be3328 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev by Jeff Sharkey · 8 years ago
  70. fdef2cd Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev by Jeff Sharkey · 8 years ago
  71. 5ec2593 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev by Jeff Sharkey · 8 years ago
  72. 5c44250 Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." am: eda1af611f am: bbcd9d26b1 by Robert Sesek · 8 years ago
  73. 5806963 Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." am: eda1af611f by Robert Sesek · 8 years ago
  74. bbcd9d2 Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." by Robert Sesek · 8 years ago
  75. eda1af6 Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." by Treehugger Robot · 8 years ago
  76. 9b44cc9 Merge "DO NOT MERGE Rename the DnsEventListenerService to NetdEventListenerService" into nyc-mr2-dev by Michal Karpinski · 8 years ago
  77. 0467529 resolve merge conflicts of 7f9014b to nyc-mr2-dev-plus-aosp by Michal Karpinski · 8 years ago
  78. 3db0a14 Merge "DO NOT MERGE Rename the DnsEventListenerService to NetdEventListenerService" into nyc-mr2-dev by Michal Karpinski · 8 years ago
  79. 133de5d Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile" am: 7dd909684f am: 33f0cf1267 by Jack He · 8 years ago
  80. 7ef7e18 Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile" am: 7dd909684f by Jack He · 8 years ago
  81. 33f0cf1 Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile" by Jack He · 8 years ago
  82. 7dd9096 Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile" by Treehugger Robot · 8 years ago
  83. 589c9a3 Merge "Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450 am: de04a0480a" into nyc-mr1-dev-plus-aosp am: 8d8cfa2345" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  84. da0b45e Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a am: e9e77f2603" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  85. 29059b4 Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a by Christine Hallstrom · 8 years ago
  86. 7513beb Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450 am: de04a0480a am: 0fbd9b7773" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  87. dc13cff Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450 am: de04a0480a" into nyc-mr1-dev-plus-aosp by Mark Salyzyn · 8 years ago
  88. 10585f5 Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450 am: de04a0480a by Mark Salyzyn · 8 years ago
  89. afd2e89 Merge "Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a" into nyc-mr1-dev-plus-aosp am: 325e93dfa3" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  90. 31a1a8e Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a am: 5599fb3795" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  91. 599697d Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a" into nyc-mr1-dev-plus-aosp by Christine Hallstrom · 8 years ago
  92. 40b42d7 Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a by Christine Hallstrom · 8 years ago
  93. c8cdab6 Merge "Merge "Get the correct operator name" am: 297e9f9a32 am: 2232ac8c59 am: 18a0e81a06" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  94. 2f31f10 Merge "Get the correct operator name" am: 297e9f9a32 am: 2232ac8c59 by Robert Greenwalt · 8 years ago
  95. c027c8d Merge "Add ability to set supported audio routes on phone accounts and connection am: 4e22d6dc45 am: 9161228e31" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  96. 22de172 Add ability to set supported audio routes on phone accounts and connection am: 4e22d6dc45 by Christine Hallstrom · 8 years ago
  97. a30ef94 Add ability to set supported audio routes on phone accounts and connection am: 4e22d6dc45 by Christine Hallstrom · 8 years ago
  98. e9e77f2 Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev by Christine Hallstrom · 8 years ago
  99. 8d8cfa2 Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450 am: de04a0480a" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  100. 325e93d Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago