Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 5697bc0dfcf4a91bc0f64aabdc1d0de78f7e522c
  1. 5697bc0 Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 5bf382063d" into nyc-mr1-dev-plus-aosp by Jeff Sharkey · 9 years ago
  2. bfd33d0 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 5bf382063d by Jeff Sharkey · 9 years ago
  3. 3d83246 Merge "DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969" into nyc-mr1-dev-plus-aosp by Jeff Sharkey · 9 years ago
  4. a5b6631 DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969 by Jeff Sharkey · 9 years ago
  5. 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 · 9 years ago
  6. 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 · 9 years ago
  7. 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 · 9 years ago
  8. 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 · 9 years ago
  9. 195caa6 Merge "Remove static link in Android framework under /frameworks/base." am: c60963e451 am: 5705ad69db by Jaekyun Seok · 9 years ago
  10. ec7e6c3 Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 5bf382063d" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  11. b09bcc7 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 by Jeff Sharkey · 9 years ago
  12. 2bfad25 Merge "DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969" into nyc-mr1-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  13. 0af2fde DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 by Jeff Sharkey · 9 years ago
  14. 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) · 9 years ago
  15. 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 · 9 years ago
  16. 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) · 9 years ago
  17. ae21f6f5b Merge "Remove static link in Android framework under /frameworks/base." am: c60963e451 by Jaekyun Seok · 9 years ago
  18. 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 · 9 years ago
  19. 5705ad6 Merge "Remove static link in Android framework under /frameworks/base." by Jaekyun Seok · 9 years ago
  20. 5bf3820 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 by Jeff Sharkey · 9 years ago
  21. 71e4281 DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad by Jeff Sharkey · 9 years ago
  22. 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 · 9 years ago
  23. 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 · 9 years ago
  24. c60963e Merge "Remove static link in Android framework under /frameworks/base." by Treehugger Robot · 9 years ago
  25. f00515f Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 by Jeff Sharkey · 9 years ago
  26. 12b2f8a DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba by Jeff Sharkey · 9 years ago
  27. 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 · 9 years ago
  28. 270d1c2 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb by Jeff Sharkey · 9 years ago
  29. 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 · 9 years ago
  30. 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 · 9 years ago
  31. 398cdb6 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours by Jeff Sharkey · 9 years ago
  32. 0891ca2fa DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours by Jeff Sharkey · 9 years ago
  33. 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 · 9 years ago
  34. 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 · 9 years ago
  35. 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) · 9 years ago
  36. 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) · 9 years ago
  37. 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 · 9 years ago
  38. 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 · 9 years ago
  39. 99b97e5 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b by Jeff Sharkey · 9 years ago
  40. 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 · 9 years ago
  41. 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 · 9 years ago
  42. 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) · 9 years ago
  43. 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 · 9 years ago
  44. c067e76 DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 by Jeff Sharkey · 9 years ago
  45. 8165a22 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours by Jeff Sharkey · 9 years ago
  46. 8d9cb50 DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d am: 9e7bd59457 by Jeff Sharkey · 9 years ago
  47. 1afc4b8 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f am: b4638e2d88 by Jeff Sharkey · 9 years ago
  48. 4d80f89 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f am: b4638e2d88 by Jeff Sharkey · 9 years ago
  49. 906cec2 DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d am: 9e7bd59457 by Jeff Sharkey · 9 years ago
  50. d7e0fab4 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce am: 21d36dcc91 by Jeff Sharkey · 9 years ago
  51. 4831305 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 by Jeff Sharkey · 9 years ago
  52. 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 · 9 years ago
  53. 26f78f5 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 by Jeff Sharkey · 9 years ago
  54. 29c335e Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 by Jeff Sharkey · 9 years ago
  55. b155106 DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 am: 2b7584f5b1 by Jeff Sharkey · 9 years ago
  56. 4ad1778 DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 by Jeff Sharkey · 9 years ago
  57. bf9a601 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f by Jeff Sharkey · 9 years ago
  58. 94b6048 DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d by Jeff Sharkey · 9 years ago
  59. 0040d4f DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d by Jeff Sharkey · 9 years ago
  60. aeeb9c8 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 by Jeff Sharkey · 9 years ago
  61. 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 · 9 years ago
  62. ef5d241 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e by Jeff Sharkey · 9 years ago
  63. dc4cbfa Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce am: 21d36dcc91 by Jeff Sharkey · 9 years ago
  64. e0fe320 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a by Jeff Sharkey · 9 years ago
  65. 9e7bd59 DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b by Jeff Sharkey · 9 years ago
  66. 1fb6b55 DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 am: 2b7584f5b1 by Jeff Sharkey · 9 years ago
  67. b4638e2 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb by Jeff Sharkey · 9 years ago
  68. 45b6a52 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours by Jeff Sharkey · 9 years ago
  69. 4610805 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 by Jeff Sharkey · 9 years ago
  70. 44e8914 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 by Jeff Sharkey · 9 years ago
  71. 2645047 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce by Jeff Sharkey · 9 years ago
  72. 26e6918 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d by Jeff Sharkey · 9 years ago
  73. ff703a3 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce by Jeff Sharkey · 9 years ago
  74. b88d8dc DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours by Jeff Sharkey · 9 years ago
  75. a07bcbc DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd by Jeff Sharkey · 9 years ago
  76. d8ee1d0 DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 by Jeff Sharkey · 9 years ago
  77. 74b3630 DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 by Jeff Sharkey · 9 years ago
  78. 37d3eec DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 by Jeff Sharkey · 9 years ago
  79. ad04786 DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 by Jeff Sharkey · 9 years ago
  80. b685f71 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev by Jeff Sharkey · 9 years ago
  81. 3f0e746 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours by Jeff Sharkey · 9 years ago
  82. a80cbee Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev by Jeff Sharkey · 9 years ago
  83. 4143345 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev by Jeff Sharkey · 9 years ago
  84. bdfb26a DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 by Jeff Sharkey · 9 years ago
  85. 190e20c DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 by Jeff Sharkey · 9 years ago
  86. 21d36dc Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev by Jeff Sharkey · 9 years ago
  87. 2b7584f DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 by Jeff Sharkey · 9 years ago
  88. 471812a Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev by Jeff Sharkey · 9 years ago
  89. 7340749 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd by Jeff Sharkey · 9 years ago
  90. 48f6bdf Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev by Jeff Sharkey · 9 years ago
  91. 0be3328 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev by Jeff Sharkey · 9 years ago
  92. 8e14278 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev by Jeff Sharkey · 9 years ago
  93. fdef2cd Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev by Jeff Sharkey · 9 years ago
  94. 5ec2593 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev by Jeff Sharkey · 9 years ago
  95. 5c44250 Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." am: eda1af611f am: bbcd9d26b1 by Robert Sesek · 9 years ago
  96. 5806963 Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." am: eda1af611f by Robert Sesek · 9 years ago
  97. bbcd9d2 Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." by Robert Sesek · 9 years ago
  98. eda1af6 Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." by Treehugger Robot · 9 years ago
  99. 9b44cc9 Merge "DO NOT MERGE Rename the DnsEventListenerService to NetdEventListenerService" into nyc-mr2-dev by Michal Karpinski · 9 years ago
  100. 0467529 resolve merge conflicts of 7f9014b to nyc-mr2-dev-plus-aosp by Michal Karpinski · 9 years ago