Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 5819755163a53eda52b0c69faaa0aac3e7026386
  1. 5819755 resolve merge conflicts of d04c51ea372a to nyc-mr2-dev-plus-aosp by Tyler Gunn · 7 years ago
  2. d04c51e Merge "Add "wifi lost" disconnect cause." am: 802b0c8fd1 am: 4e26b8e75e by Tyler Gunn · 7 years ago
  3. 4e26b8e Merge "Add "wifi lost" disconnect cause." am: 802b0c8fd1 by Tyler Gunn · 7 years ago
  4. 802b0c8 Merge "Add "wifi lost" disconnect cause." by Tyler Gunn · 7 years ago
  5. 63e0f2f Merge "Optimize seccomp" am: 7e812616c9 am: 9375f3eff6 am: 38b7d83f8e by Paul Lawrence · 7 years ago
  6. 38b7d83 Merge "Optimize seccomp" am: 7e812616c9 am: 9375f3eff6 by Paul Lawrence · 7 years ago
  7. 9375f3e Merge "Optimize seccomp" am: 7e812616c9 by Paul Lawrence · 7 years ago
  8. 7e81261 Merge "Optimize seccomp" by Paul Lawrence · 7 years ago
  9. 87f208b Add "wifi lost" disconnect cause. by Tyler Gunn · 7 years ago
  10. 0a9904d Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by Bill Yi · 7 years ago
  11. c48ebb5 Import translations. DO NOT MERGE am: 49a9d35eb7 -s ours by Bill Yi · 7 years ago
  12. 7acceb8 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  13. ca4daf9 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by Bill Yi · 7 years ago
  14. 709924e Import translations. DO NOT MERGE am: 37093ca19c -s ours by Bill Yi · 7 years ago
  15. 60752b1 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by Bill Yi · 7 years ago
  16. e0d6074 Import translations. DO NOT MERGE am: 31423f28b7 -s ours by Bill Yi · 7 years ago
  17. 28a5145 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by Bill Yi · 7 years ago
  18. 83660c7 Import translations. DO NOT MERGE am: b2d808b3f3 -s ours by Bill Yi · 7 years ago
  19. 0b708f9 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by Bill Yi · 7 years ago
  20. dd2a43f Import translations. DO NOT MERGE am: f812207041 -s ours by Bill Yi · 7 years ago
  21. 951842a Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by Bill Yi · 7 years ago
  22. bbed9c1 Import translations. DO NOT MERGE am: ba8e772bbe -s ours by Bill Yi · 7 years ago
  23. 3487bfe Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by Bill Yi · 7 years ago
  24. 1a3602d Import translations. DO NOT MERGE am: 8c97416258 -s ours by Bill Yi · 7 years ago
  25. e1b47c5 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by Bill Yi · 7 years ago
  26. c261c34 Import translations. DO NOT MERGE am: 62c95279e2 -s ours by Bill Yi · 7 years ago
  27. 2ad224e Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by Bill Yi · 7 years ago
  28. 3d1d189 Import translations. DO NOT MERGE am: 9b11a3cea8 -s ours by Bill Yi · 7 years ago
  29. d46d030 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  30. b2d152e Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  31. 3621135 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  32. e2d9a7f Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  33. a9d4a2c Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  34. 1889100 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  35. ec47322 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  36. c3d842d Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  37. 49a9d35 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  38. 9b11a3c Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  39. 8c97416 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  40. 62c9527 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  41. ba8e772 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  42. b2d808b3 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  43. 37093ca Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  44. 31423f2 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  45. f812207 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  46. b9cc700 Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43 -s ours am: 43f79eec8b am: cecf30c3a2 am: 5a50d2b12c am: 34df10ec98 by Jeff Sharkey · 7 years ago
  47. 85b6faf DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7 -s ours am: 65b0a6f596 am: 6f47221263 am: 47bfa0ab25 am: 6cfa84791d by Jeff Sharkey · 7 years ago
  48. f77ab96 Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours am: bafa3c1d3b am: 7cd3c47c29 am: 770eff87cd am: ce15555148 by Jeff Sharkey · 7 years ago
  49. 3d95a03 DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours am: cdb996355e am: d2a9d6fa27 am: 8d9953964a am: 8c23d1aadb by Jeff Sharkey · 7 years ago
  50. 8258a2f Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526 -s ours am: f19cea14cf am: ee958351b7 am: e6060558b3 am: 1eb2ded281 by Jeff Sharkey · 7 years ago
  51. 538787f DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53 am: 4942836d3c -s ours am: 1a9c03f320 am: 928574895b am: fd855eeb29 am: e6f2767d54 by Jeff Sharkey · 7 years ago
  52. 94f51c9 Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223 am: 8469d52d41 -s ours am: f68199a472 am: a7388f1ed4 am: 7a6bd686a3 am: 1e9b978dc7 by Jeff Sharkey · 7 years ago
  53. 85e0241 DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am: bdb0c8fc17 -s ours am: 09d230d473 am: 86a0c4d4d7 am: d30514edc6 am: 2e3a277175 by Jeff Sharkey · 7 years ago
  54. 7d7e1be Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d1471 -s ours am: 0e09e8c201 am: 33cd012e56 am: 06b98e6b3c am: 76ce0386db by Jeff Sharkey · 7 years ago
  55. dec6e5a Merge "DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846 am: 9f70b6d4c5 am: 1007b773b9 am: 8501b686f7 am: 030e74a380" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  56. a5aab48 Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43 -s ours am: 43f79eec8b am: cecf30c3a2 am: 5a50d2b12c by Jeff Sharkey · 7 years ago
  57. a414061 Merge "Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43 -s ours am: 43f79eec8b am: cecf30c3a2 am: 5a50d2b12c am: 34df10ec98 am: 0387fd89f2" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  58. 3a29ee3 DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846 am: 9f70b6d4c5 am: 1007b773b9 am: 8501b686f7 by Jeff Sharkey · 7 years ago
  59. 651c9cd Merge "Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6 am: 609145c315 am: af86efd70d" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  60. 098777d Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43 -s ours am: 43f79eec8b am: cecf30c3a2 am: 5a50d2b12c am: 34df10ec98 by Jeff Sharkey · 7 years ago
  61. 76970ce Merge "DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7 -s ours am: 65b0a6f596 am: 6f47221263 am: 47bfa0ab25 am: 6cfa84791d am: 87ae27b020" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  62. ed3b366 DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7 -s ours am: 65b0a6f596 am: 6f47221263 am: 47bfa0ab25 by Jeff Sharkey · 7 years ago
  63. 70ed66c Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6 am: 609145c315 by Jeff Sharkey · 7 years ago
  64. 6328cc2 Merge "DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe am: e25ab62f5b am: cc17b28c0c" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  65. f122300 DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7 -s ours am: 65b0a6f596 am: 6f47221263 am: 47bfa0ab25 am: 6cfa84791d by Jeff Sharkey · 7 years ago
  66. d44a365 Merge "Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours am: bafa3c1d3b am: 7cd3c47c29 am: 770eff87cd am: ce15555148 am: 0792846ea5" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  67. 1834734 DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe am: e25ab62f5b by Jeff Sharkey · 7 years ago
  68. e8895e8 Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours am: bafa3c1d3b am: 7cd3c47c29 am: 770eff87cd by Jeff Sharkey · 7 years ago
  69. 04bfaf9 Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours am: bafa3c1d3b am: 7cd3c47c29 am: 770eff87cd am: ce15555148 by Jeff Sharkey · 7 years ago
  70. 579dd3b Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am: 6b8ae05e36 am: 806307106b by Jeff Sharkey · 7 years ago
  71. de02369 DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours am: cdb996355e am: d2a9d6fa27 am: 8d9953964a by Jeff Sharkey · 7 years ago
  72. 42dbff7 DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3 am: 30a4388481 by Jeff Sharkey · 7 years ago
  73. 1a934fe Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours am: 32c6684a67 -s ours am: bcc2e70d40 -s ours am: 6b398f72cb -s ours am: cda0f97790 -s ours by Suprabh Shukla · 7 years ago
  74. d4adaad Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526 -s ours am: f19cea14cf am: ee958351b7 am: e6060558b3 by Jeff Sharkey · 7 years ago
  75. 20ddce2 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours am: 6b1fd0f9cf -s ours am: 56be9656f7 -s ours am: e3d5ea3a18 -s ours am: 58d9af0c77 -s ours by Suprabh Shukla · 7 years ago
  76. 1d5d7d1 DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53 am: 4942836d3c -s ours am: 1a9c03f320 am: 928574895b am: fd855eeb29 by Jeff Sharkey · 7 years ago
  77. 0387fd8 Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43 -s ours am: 43f79eec8b am: cecf30c3a2 am: 5a50d2b12c by Jeff Sharkey · 7 years ago
  78. d96c17f Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223 am: 8469d52d41 -s ours am: f68199a472 am: a7388f1ed4 am: 7a6bd686a3 by Jeff Sharkey · 7 years ago
  79. 87ae27b DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7 -s ours am: 65b0a6f596 am: 6f47221263 am: 47bfa0ab25 by Jeff Sharkey · 7 years ago
  80. f6fa670 Merge "DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours am: cdb996355e am: d2a9d6fa27 am: 8d9953964a am: 8c23d1aadb am: b93bc585f0" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  81. a53b437 DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours am: cdb996355e am: d2a9d6fa27 am: 8d9953964a am: 8c23d1aadb by Jeff Sharkey · 7 years ago
  82. 0792846 Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours am: bafa3c1d3b am: 7cd3c47c29 am: 770eff87cd by Jeff Sharkey · 7 years ago
  83. 7b2985b DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am: bdb0c8fc17 -s ours am: 09d230d473 am: 86a0c4d4d7 am: d30514edc6 by Jeff Sharkey · 7 years ago
  84. 626d56f Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d1471 -s ours am: 0e09e8c201 am: 33cd012e56 am: 06b98e6b3c by Jeff Sharkey · 7 years ago
  85. e654f46 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a -s ours am: f1e045b733 am: dcc633f1f8 am: 67a4d3e428 am: 710a7e40dc by Suprabh Shukla · 7 years ago
  86. 030e74a DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846 am: 9f70b6d4c5 am: 1007b773b9 by Jeff Sharkey · 7 years ago
  87. d11c702 Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc am: 73d19fc1a0 am: 5a2e7e2e58 am: b2cdb4e2dd by Suprabh Shukla · 7 years ago
  88. af86efd Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6 by Jeff Sharkey · 7 years ago
  89. b93bc58 DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours am: cdb996355e am: d2a9d6fa27 am: 8d9953964a by Jeff Sharkey · 7 years ago
  90. d4b5177 DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42 am: af7a739889 -s ours am: 5fce769ecf am: 642912652e am: a293067f0b am: 3411150115 by Suprabh Shukla · 7 years ago
  91. cc17b28 DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe by Jeff Sharkey · 7 years ago
  92. 34df10e Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43 -s ours am: 43f79eec8b am: cecf30c3a2 by Jeff Sharkey · 7 years ago
  93. 6529292 Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am: 6b8ae05e36 by Jeff Sharkey · 7 years ago
  94. 6cfa847 DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7 -s ours am: 65b0a6f596 am: 6f47221263 by Jeff Sharkey · 7 years ago
  95. 825a242 DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3 am: 30a4388481 by Jeff Sharkey · 7 years ago
  96. ce15555 Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours am: bafa3c1d3b am: 7cd3c47c29 by Jeff Sharkey · 7 years ago
  97. e12285a Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours am: 32c6684a67 -s ours am: bcc2e70d40 -s ours am: 6b398f72cb -s ours by Suprabh Shukla · 7 years ago
  98. b696cba DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours am: 6b1fd0f9cf -s ours am: 56be9656f7 -s ours am: e3d5ea3a18 -s ours by Suprabh Shukla · 7 years ago
  99. 1350f9a resolve merge conflicts of e06c03d8437f to nyc-mr1-dev-plus-aosp am: 5c6041843d by Jack Yu · 7 years ago
  100. 8c23d1a DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours am: cdb996355e am: d2a9d6fa27 by Jeff Sharkey · 7 years ago