Gitiles
Code Review Sign In
review.blissroms.org / platform_system_core_old / cc78bd56fec8c4f697b3494eae0db90706bfe5ee
  1. cc78bd5 FileMap::create: remove duplicate addition. am: 54794ac613 am: 2912d9c190 by Elliott Hughes · 4 years, 7 months ago
  2. 2cd29e4 FileMap::create: remove duplicate addition. am: 54794ac613 by Elliott Hughes · 4 years, 7 months ago
  3. 760cabe FileMap::create: remove duplicate addition. by Elliott Hughes · 4 years, 8 months ago
  4. 1c2859f Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 by Steven Moreland · 4 years, 8 months ago
  5. 00cb016 Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 by Steven Moreland · 4 years, 8 months ago
  6. 372ad41 Merge "libutils: check vsnprintf error" into oc-dev by Steven Moreland · 4 years, 8 months ago
  7. d6297be Merge "Fail explicitly on length overflow." into oc-dev am: ea8d38e77f am: cf91151364 by TreeHugger Robot · 4 years, 8 months ago
  8. f69c785 Merge "Fail explicitly on length overflow." into oc-dev am: ea8d38e77f by TreeHugger Robot · 4 years, 8 months ago
  9. f8788be Merge "Fail explicitly on length overflow." into oc-dev by TreeHugger Robot · 4 years, 8 months ago
  10. faf53f3 libutils: check vsnprintf error by Steven Moreland · 4 years, 8 months ago
  11. 31f1a81 String16::remove - avoid overflow am: 4048e49956 am: 107f18cb61 by Steven Moreland · 4 years, 9 months ago
  12. 71d373a String16::remove - avoid overflow am: 4048e49956 by Steven Moreland · 4 years, 9 months ago
  13. c44772f Fail explicitly on length overflow. by Christopher Ferris · 4 years, 10 months ago
  14. 3b0abc4 String16::remove - avoid overflow by Steven Moreland · 4 years, 10 months ago
  15. 82c9e36 FlattenableUtils::align memsets am: e62a9d7669 am: 59e7d4e8ea by Steven Moreland · 5 years ago
  16. 3ca7617 FlattenableUtils::align memsets am: e62a9d7669 by Steven Moreland · 5 years ago
  17. acea7c7 FlattenableUtils::align memsets by Steven Moreland · 5 years ago
  18. 71c94b5 [automerger] Fix a memory leak in gatekeeper. am: 6a9c4e7968 am: bdc924f31d am: 7535975701 am: e126026c02 am: 4ae4ad8e5b am: b25983460c by Janis Danisevskis · 6 years ago
  19. 55f400a [automerger] Fix a memory leak in gatekeeper. am: 6a9c4e7968 am: bdc924f31d am: 7535975701 am: e126026c02 am: 4ae4ad8e5b by Janis Danisevskis · 6 years ago
  20. 8d1b826 [automerger] Fix a memory leak in gatekeeper. am: 6a9c4e7968 am: bdc924f31d am: 7535975701 am: e126026c02 am: 4ae4ad8e5b by Android Build Merger (Role) · 6 years ago
  21. 8d25a11 [automerger] Fix a memory leak in gatekeeper. am: 6a9c4e7968 am: bdc924f31d am: 7535975701 am: e126026c02 by Android Build Merger (Role) · 6 years ago
  22. 3b3e372 [automerger] Fix a memory leak in gatekeeper. am: 6a9c4e7968 am: bdc924f31d am: 7535975701 by Android Build Merger (Role) · 6 years ago
  23. f487ae5 [automerger] Fix a memory leak in gatekeeper. am: 6a9c4e7968 am: bdc924f31d by Android Build Merger (Role) · 6 years ago
  24. b11746f [automerger] Fix a memory leak in gatekeeper. am: 6a9c4e7968 by Android Build Merger (Role) · 6 years ago
  25. 80716e5 Fix a memory leak in gatekeeper. by Janis Danisevskis · 6 years ago
  26. 30e5dec [automerger skipped] Export maximum number of fds/ints in a native_handle. am: c1cea05b5f -s ours am skip reason: change_id I0eafff70d3a7e4d732fe600a0052efb90108208d with SHA1 02debfa2df is in history by Martijn Coenen · 6 years ago
  27. b24619a [automerger skipped] Export maximum number of fds/ints in a native_handle. by Martijn Coenen · 6 years ago
  28. 3e47cbf Export maximum number of fds/ints in a native_handle. am: 02debfa2df by Martijn Coenen · 6 years ago
  29. af5dadd Export maximum number of fds/ints in a native_handle. by Martijn Coenen · 6 years ago
  30. f6f8e91 Export maximum number of fds/ints in a native_handle. by Martijn Coenen · 6 years ago
  31. bd63483 [automerger] String16: remove integer overflows am: d0648d8dc6 am: 9de539d0dd am: 726007edf0 am: 4ca82d1d14 am: 35629db6fe am: dc2153c913 am: f479f90679 am: e9df4d52f7 am: dd95a7f10d am: f546acd3fa -s ours by Steven Moreland · 7 years ago
  32. 246a55a [automerger] String16: remove integer overflows am: d0648d8dc6 am: 9de539d0dd am: 726007edf0 am: 4ca82d1d14 am: 35629db6fe am: dc2153c913 am: f479f90679 am: e9df4d52f7 am: dd95a7f10d by Steven Moreland · 7 years ago
  33. 7c52112 [automerger] String16: remove integer overflows am: d0648d8dc6 am: 9de539d0dd am: 726007edf0 am: 4ca82d1d14 am: 35629db6fe am: dc2153c913 am: f479f90679 am: e9df4d52f7 am: dd95a7f10d by Android Build Merger (Role) · 7 years ago
  34. 058aed4 [automerger] String16: remove integer overflows am: d0648d8dc6 am: 9de539d0dd am: 726007edf0 am: 4ca82d1d14 am: 35629db6fe am: dc2153c913 am: f479f90679 am: e9df4d52f7 by Android Build Merger (Role) · 7 years ago
  35. 4030c4e [automerger] String16: remove integer overflows am: d0648d8dc6 am: 9de539d0dd am: 726007edf0 am: 4ca82d1d14 am: 35629db6fe am: dc2153c913 am: f479f90679 by Android Build Merger (Role) · 7 years ago
  36. 2160141 [automerger] String16: remove integer overflows am: d0648d8dc6 am: 9de539d0dd am: 726007edf0 am: 4ca82d1d14 am: 35629db6fe am: dc2153c913 by Android Build Merger (Role) · 7 years ago
  37. 829470d [automerger] String16: remove integer overflows am: d0648d8dc6 am: 9de539d0dd am: 726007edf0 am: 4ca82d1d14 am: 35629db6fe by Android Build Merger (Role) · 7 years ago
  38. 39654f0 [automerger] String16: remove integer overflows am: d0648d8dc6 am: 9de539d0dd am: 726007edf0 am: 4ca82d1d14 by Android Build Merger (Role) · 7 years ago
  39. 4610656 [automerger] String16: remove integer overflows am: d0648d8dc6 am: 9de539d0dd am: 726007edf0 by Android Build Merger (Role) · 7 years ago
  40. 7128831 [automerger] String16: remove integer overflows am: d0648d8dc6 am: 9de539d0dd by Android Build Merger (Role) · 7 years ago
  41. 75af7dc [automerger] String16: remove integer overflows am: d0648d8dc6 by Android Build Merger (Role) · 7 years ago
  42. e71db1d String16: remove integer overflows am: 0e5fbea01c am: b02e0ab211 by Steven Moreland · 7 years ago
  43. d0be2fd String16: remove integer overflows am: 0e5fbea01c by Steven Moreland · 7 years ago
  44. 6561567 String16: remove integer overflows by Steven Moreland · 7 years ago
  45. 85ede77 String16: remove integer overflows by Steven Moreland · 7 years ago
  46. 71c141e libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499 am: 8191e9ba87 am: 804323c195 am: 4f5f00d879 am: 3a1ff1ad71 am: bab7b1ecd9 am: cdf0fc6018 by tintin · 7 years ago
  47. f81acff libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499 am: 8191e9ba87 am: 804323c195 am: 4f5f00d879 am: 3a1ff1ad71 am: bab7b1ecd9 by tintin · 7 years ago
  48. be190a3 libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499 am: 8191e9ba87 am: 804323c195 am: 4f5f00d879 am: 3a1ff1ad71 by tintin · 7 years ago
  49. eb8e43e libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499 am: 8191e9ba87 am: 804323c195 am: 4f5f00d879 by tintin · 7 years ago
  50. 2864e74 libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499 am: 8191e9ba87 am: 804323c195 by tintin · 7 years ago
  51. 90b4b5c libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499 am: 8191e9ba87 by tintin · 7 years ago
  52. 5e21f07 libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499 by tintin · 7 years ago
  53. a5b9f77 libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 by tintin · 7 years ago
  54. b360059 libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 by tintin · 7 years ago
  55. b388b1e libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f by tintin · 7 years ago
  56. 3dd9a4f libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 by tintin · 7 years ago
  57. 6f62061 libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 by tintin · 7 years ago
  58. cee6d38 libnetutil: Check dhcp respose packet length am: 61f25d4a36 by tintin · 7 years ago
  59. f540262 DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 am: 9800d5d074 -s ours am: c995780ded am: 10d3ff2004 am: 5bccb55338 am: 7fe7bce52f am: d07ba77e60 -s ours am: fb1a14ad59 by Narayan Kamath · 7 years ago
  60. d77262c DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f am: b46123a98d -s ours am: 97d2cfab6a am: ea2010e196 am: a4de1f4749 am: 5995e741e5 am: bc5fc101ad -s ours am: b1f99e94d8 by Narayan Kamath · 7 years ago
  61. c043074 DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 am: 9800d5d074 -s ours am: c995780ded am: 10d3ff2004 am: 5bccb55338 am: 7fe7bce52f am: d07ba77e60 -s ours by Narayan Kamath · 7 years ago
  62. d3ef3c1 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f am: b46123a98d -s ours am: 97d2cfab6a am: ea2010e196 am: a4de1f4749 am: 5995e741e5 am: bc5fc101ad -s ours by Narayan Kamath · 7 years ago
  63. 866b5fc DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e am: 4f22203279 am: ea729dcae5 am: 369bf9065d am: 79f474a679 -s ours am: c26850c970 by Narayan Kamath · 7 years ago
  64. efef630 Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 am: d27178e362 am: 1bab31a4df am: 3fb0e4ae70 by Narayan Kamath · 7 years ago
  65. dc3b081 DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 am: 9800d5d074 -s ours am: c995780ded am: 10d3ff2004 am: 5bccb55338 am: 7fe7bce52f by Narayan Kamath · 7 years ago
  66. 01e0911 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e am: 4f22203279 am: ea729dcae5 am: 369bf9065d am: 79f474a679 -s ours by Narayan Kamath · 7 years ago
  67. ff4fa42 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f am: b46123a98d -s ours am: 97d2cfab6a am: ea2010e196 am: a4de1f4749 am: 5995e741e5 by Narayan Kamath · 7 years ago
  68. 9a8bbd5 DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 am: 9800d5d074 -s ours am: c995780ded am: 10d3ff2004 am: 5bccb55338 by Narayan Kamath · 7 years ago
  69. fce6190 Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 am: d27178e362 am: 1bab31a4df by Narayan Kamath · 7 years ago
  70. 7ccd3e9 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f am: b46123a98d -s ours am: 97d2cfab6a am: ea2010e196 am: a4de1f4749 by Narayan Kamath · 7 years ago
  71. 92fa7fb DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 am: 9800d5d074 -s ours am: c995780ded am: 10d3ff2004 by Narayan Kamath · 7 years ago
  72. 831422d DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e am: 4f22203279 am: ea729dcae5 am: 369bf9065d by Narayan Kamath · 7 years ago
  73. e975d4e Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 am: d27178e362 by Narayan Kamath · 7 years ago
  74. 753786f DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f am: b46123a98d -s ours am: 97d2cfab6a am: ea2010e196 by Narayan Kamath · 7 years ago
  75. 98f1767 DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 am: 9800d5d074 -s ours am: c995780ded by Narayan Kamath · 7 years ago
  76. ef7273e DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e am: 4f22203279 am: ea729dcae5 by Narayan Kamath · 7 years ago
  77. 1806bab DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f am: b46123a98d -s ours am: 97d2cfab6a by Narayan Kamath · 7 years ago
  78. aa9c65a Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 by Narayan Kamath · 7 years ago
  79. b183c6c DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e am: 4f22203279 by Narayan Kamath · 7 years ago
  80. 35ce0d4 DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 am: 9800d5d074 -s ours by Narayan Kamath · 7 years ago
  81. 5c24081 Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 by Narayan Kamath · 7 years ago
  82. 72a2df2 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours am: 886eb4351e by Narayan Kamath · 7 years ago
  83. 20403ba DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f am: b46123a98d -s ours by Narayan Kamath · 7 years ago
  84. 425991c DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 by Narayan Kamath · 7 years ago
  85. b37dd8a Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 by Narayan Kamath · 7 years ago
  86. 4e743c1 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f by Narayan Kamath · 7 years ago
  87. 2108099 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a am: 685a175cb0 -s ours by Narayan Kamath · 7 years ago
  88. 65b6b83 DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d by Narayan Kamath · 7 years ago
  89. 777998b Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f by Narayan Kamath · 7 years ago
  90. fb05569 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ours am: 951b0dccf0 am: 6e598b9e9d by Narayan Kamath · 7 years ago
  91. 25bcc25 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 am: a413ac3c8a by Narayan Kamath · 7 years ago
  92. 75fc647 DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a by Narayan Kamath · 7 years ago
  93. b709664 Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 by Narayan Kamath · 7 years ago
  94. 68e842c DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ours am: 951b0dccf0 by Narayan Kamath · 7 years ago
  95. 174bba1 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 by Narayan Kamath · 7 years ago
  96. 0298959 Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f am: 5d8784c53d by Narayan Kamath · 7 years ago
  97. dc63432 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 by Narayan Kamath · 7 years ago
  98. 8c1753d DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours am: e1257bad6e -s ours by Narayan Kamath · 7 years ago
  99. 3fc9266 Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours am: 95584d203f by Narayan Kamath · 7 years ago
  100. 12e79a4 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ours by Narayan Kamath · 7 years ago