Gitiles
Code Review Sign In
review.blissroms.org / platform_system_core / d05ecb8d9d62c121d154ea77dfb2bc8bbc8b6387
  1. d05ecb8 Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 by Steven Moreland · 5 years ago
  2. d8801aa Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 by Steven Moreland · 5 years ago
  3. a03d37d Merge "libutils: check vsnprintf error" into oc-dev by Steven Moreland · 5 years ago
  4. 84dcff4 Merge "Fail explicitly on length overflow." into oc-dev am: ea8d38e77f am: cf91151364 by TreeHugger Robot · 5 years ago
  5. cf91151 Merge "Fail explicitly on length overflow." into oc-dev am: ea8d38e77f by TreeHugger Robot · 5 years ago
  6. ea8d38e Merge "Fail explicitly on length overflow." into oc-dev by TreeHugger Robot · 5 years ago
  7. ee22384 libutils: check vsnprintf error by Steven Moreland · 5 years ago
  8. 9be245c String16::remove - avoid overflow am: 4048e49956 am: 107f18cb61 by Steven Moreland · 5 years ago
  9. 107f18c String16::remove - avoid overflow am: 4048e49956 by Steven Moreland · 5 years ago
  10. 4d14303 Fail explicitly on length overflow. by Christopher Ferris · 5 years ago
  11. 4048e49 String16::remove - avoid overflow by Steven Moreland · 5 years ago
  12. 3f273f4 FlattenableUtils::align memsets am: e62a9d7669 am: 59e7d4e8ea by Steven Moreland · 6 years ago
  13. 59e7d4e FlattenableUtils::align memsets am: e62a9d7669 by Steven Moreland · 6 years ago
  14. e62a9d7 FlattenableUtils::align memsets by Steven Moreland · 6 years ago
  15. ca662c7 [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
  16. 20e73e2 [automerger] Fix a memory leak in gatekeeper. am: 6a9c4e7968 am: bdc924f31d am: 7535975701 am: e126026c02 am: 4ae4ad8e5b by Janis Danisevskis · 6 years ago
  17. b259834 [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
  18. 4ae4ad8 [automerger] Fix a memory leak in gatekeeper. am: 6a9c4e7968 am: bdc924f31d am: 7535975701 am: e126026c02 by Android Build Merger (Role) · 6 years ago
  19. e126026 [automerger] Fix a memory leak in gatekeeper. am: 6a9c4e7968 am: bdc924f31d am: 7535975701 by Android Build Merger (Role) · 6 years ago
  20. 7535975 [automerger] Fix a memory leak in gatekeeper. am: 6a9c4e7968 am: bdc924f31d by Android Build Merger (Role) · 6 years ago
  21. bdc924f [automerger] Fix a memory leak in gatekeeper. am: 6a9c4e7968 by Android Build Merger (Role) · 6 years ago
  22. 6a9c4e7 Fix a memory leak in gatekeeper. by Janis Danisevskis · 6 years ago
  23. c9455b4 [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 · 7 years ago
  24. 479b854 [automerger skipped] Export maximum number of fds/ints in a native_handle. by Martijn Coenen · 7 years ago
  25. 5fa5708 Export maximum number of fds/ints in a native_handle. am: 02debfa2df by Martijn Coenen · 7 years ago
  26. c1cea05 Export maximum number of fds/ints in a native_handle. by Martijn Coenen · 7 years ago
  27. 02debfa Export maximum number of fds/ints in a native_handle. by Martijn Coenen · 7 years ago
  28. 4e13bf0 [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
  29. 9ce034c [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
  30. f546acd [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
  31. dd95a7f [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
  32. e9df4d5 [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
  33. f479f90 [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
  34. dc2153c [automerger] String16: remove integer overflows am: d0648d8dc6 am: 9de539d0dd am: 726007edf0 am: 4ca82d1d14 am: 35629db6fe by Android Build Merger (Role) · 7 years ago
  35. 35629db [automerger] String16: remove integer overflows am: d0648d8dc6 am: 9de539d0dd am: 726007edf0 am: 4ca82d1d14 by Android Build Merger (Role) · 7 years ago
  36. 4ca82d1 [automerger] String16: remove integer overflows am: d0648d8dc6 am: 9de539d0dd am: 726007edf0 by Android Build Merger (Role) · 7 years ago
  37. 726007e [automerger] String16: remove integer overflows am: d0648d8dc6 am: 9de539d0dd by Android Build Merger (Role) · 7 years ago
  38. 9de539d [automerger] String16: remove integer overflows am: d0648d8dc6 by Android Build Merger (Role) · 7 years ago
  39. 1549baa String16: remove integer overflows am: 0e5fbea01c am: b02e0ab211 by Steven Moreland · 7 years ago
  40. b02e0ab String16: remove integer overflows am: 0e5fbea01c by Steven Moreland · 7 years ago
  41. d0648d8 String16: remove integer overflows by Steven Moreland · 7 years ago
  42. 0e5fbea String16: remove integer overflows by Steven Moreland · 7 years ago
  43. d60dc7e 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 · 8 years ago
  44. 9f1398c 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 · 8 years ago
  45. cdf0fc6 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 · 8 years ago
  46. bab7b1e 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 · 8 years ago
  47. 3a1ff1a libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499 am: 8191e9ba87 am: 804323c195 by tintin · 8 years ago
  48. 4f5f00d libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499 am: 8191e9ba87 by tintin · 8 years ago
  49. 804323c libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499 by tintin · 8 years ago
  50. 8191e9b libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 by tintin · 8 years ago
  51. 19702dc libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 by tintin · 8 years ago
  52. 3de04e9 libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f by tintin · 8 years ago
  53. c29049f libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 by tintin · 8 years ago
  54. 29d0540 libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 by tintin · 8 years ago
  55. cee6d38 libnetutil: Check dhcp respose packet length am: 61f25d4a36 by tintin · 8 years ago
  56. fdd67a5 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 · 8 years ago
  57. d67178d 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 · 8 years ago
  58. c184678 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 · 8 years ago
  59. b29e9fe 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 · 8 years ago
  60. bccf04a 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 · 8 years ago
  61. cc0a358 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 · 8 years ago
  62. fb1a14a 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 · 8 years ago
  63. 8085ab4 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 · 8 years ago
  64. b1f99e9 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 · 8 years ago
  65. d07ba77 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 · 8 years ago
  66. 3cee49d 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 · 8 years ago
  67. bc5fc10 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 · 8 years ago
  68. 7fe7bce 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 · 8 years ago
  69. c26850c 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 · 8 years ago
  70. 3fb0e4a 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 · 8 years ago
  71. 5995e74 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 · 8 years ago
  72. 5bccb55 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 · 8 years ago
  73. 79f474a 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 · 8 years ago
  74. a4de1f4 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 · 8 years ago
  75. 1bab31a 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 · 8 years ago
  76. 369bf90 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 · 8 years ago
  77. 10d3ff2 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 · 8 years ago
  78. d27178e 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 · 8 years ago
  79. ea729dc 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 · 8 years ago
  80. ea2010e 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 · 8 years ago
  81. c995780 DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d am: 3a46bcc3e0 by Narayan Kamath · 8 years ago
  82. 45ce854 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 · 8 years ago
  83. 97d2cfa DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ours am: 951b0dccf0 am: 6e598b9e9d am: 4b187be82f by Narayan Kamath · 8 years ago
  84. 4f22203 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 · 8 years ago
  85. 9800d5d DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a am: 4bcb04290d by Narayan Kamath · 8 years ago
  86. 626bb14 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 · 8 years ago
  87. b46123a DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ours am: 951b0dccf0 am: 6e598b9e9d by Narayan Kamath · 8 years ago
  88. 886eb43 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 · 8 years ago
  89. 3a46bcc DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours am: e1257bad6e -s ours am: 89b22dff0a by Narayan Kamath · 8 years ago
  90. b70bb65 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 · 8 years ago
  91. 4b187be DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ours am: 951b0dccf0 by Narayan Kamath · 8 years ago
  92. 685a175 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 am: 28a7d07705 by Narayan Kamath · 8 years ago
  93. 36424c8 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 · 8 years ago
  94. a413ac3 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours am: 59c7fe7a39 by Narayan Kamath · 8 years ago
  95. 4bcb042 DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours am: e1257bad6e -s ours by Narayan Kamath · 8 years ago
  96. d86a41e 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 · 8 years ago
  97. 6e598b9 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: eeb93c9a64 -s ours by Narayan Kamath · 8 years ago
  98. 28a7d07 DO NOT MERGE : Fix build breakage due to 2d516d2d46b1b1. am: 547c7d9a0b -s ours am: 4732ec6440 -s ours by Narayan Kamath · 8 years ago
  99. 5d8784c Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff -s ours by Narayan Kamath · 8 years ago
  100. 89b22df DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3 -s ours by Narayan Kamath · 8 years ago