Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_av / d3037f070e0e67e3b7d9cf616457598aed3d9d7e
  1. d3037f0 am 09854077: (-s ours) am 76dea1de: libstagefright: check overflow before memory allocation in OMXCodec.cpp by Wei Jia · 10 years ago
  2. e11e96e am 189f7e43: (-s ours) am 819b89aa: am 84c1e5a9: Merge "Whitelist *ToPlanar from integer sanitization" by Chad Brubaker · 10 years ago
  3. d12ddd9 am dc0b4c7b: (-s ours) am e857d28d: Merge "TimestretchBufferProvider: getNextBuffer should follow API" into mnc-dev by Andy Hung · 10 years ago
  4. 5623d44 am 371da9af: (-s ours) Enable unsigned-integer-overflow by Chad Brubaker · 10 years ago
  5. 08b6027 am e21dfd02: (-s ours) resolved conflicts for merge of b571ecfd to mnc-dev-plus-aosp by Chad Brubaker · 10 years ago
  6. febda71 am 0c9e64b3: (-s ours) am 4a3bb67a: am 73dd4321: Merge "Whitelist updatePCR from fsanitize=integer" by Chad Brubaker · 10 years ago
  7. c8493ec am 7e7a4e32: (-s ours) resolved conflicts for merge of 3554658d to mnc-dev-plus-aosp by Chad Brubaker · 10 years ago
  8. 7fa5811 am 6ce3a998: (-s ours) am 39515ddc: am 47b90fe2: (-s ours) am b69a01a5: am 07a2e912: am 323d22e7: am 8319fadb: am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage by Wei Jia · 10 years ago
  9. 680e464 am 55a422a3: (-s ours) resolved conflicts for merge of 6dd63b23 to mnc-dev-plus-aosp by Nick Kralevich · 10 years ago
  10. 620d39b am 2fe63c65: (-s ours) am 5bd9771c: (-s ours) am 2c99211d: Merge "Enable unsigned-integer-overflow" by Chad Brubaker · 10 years ago
  11. bb64411 am eccf3f8d: (-s ours) am 38253353: am bde8adfe: Merge "Fix benign unsigned integer overflow" by Chad Brubaker · 10 years ago
  12. 145800b am d76f0c9f: (-s ours) am 230fc5a9: am e89f6562: Merge "Fix benign unsigned integer overflows" by Chad Brubaker · 10 years ago
  13. 457b139 am e0f22d3c: (-s ours) am 8d692386: am 0351b0e2: Merge "Fix benign unsigned integer overflow" by Chad Brubaker · 10 years ago
  14. 4056431 am 13f62356: (-s ours) am 3af0af10: (-s ours) am e117ee90: Merge "Fix benign unsigned integer overflows in loop conditions" by Chad Brubaker · 10 years ago
  15. a9a3eb4 am 881d59b6: (-s ours) am ecff57d7: (-s ours) am aaf36e2f: Merge "don\'t trigger an integer underflow when decrementing." by Chad Brubaker · 10 years ago
  16. aa88bff am 2bc1468c: (-s ours) am 1221759c: am ce61bb6a: (-s ours) am 52a9a61b: am bb64d2fb: am 21b14554: am e4a9d859: am ca095ac2: (-s ours) am 8de6d690: Fix build break DO NOT MERGE by Jeff Tinker · 10 years ago
  17. d0825a7 am 315b342d: (-s ours) am 9abb6302: am f7ddd009: Merge "bundle init.rc contents with its service" by Tom Cherry · 10 years ago
  18. f63f5e6 am 128aa320: (-s ours) am ba67d2fe: am 93eb5ecf: Merge "Prevent divide by zero in WAVExtractor" by Marco Nelissen · 10 years ago
  19. 927be92 am 299063a5: (-s ours) am 53edaffa: am b7d6e637: (-s ours) am 186993d7: am 4bbd5238: am 9c9f8620: am f8bf4acb: am fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere by Jeff Tinker · 10 years ago
  20. e3455f5 am 0d316049: (-s ours) am e2c89788: am b512e0a3: (-s ours) am 0ea1da27: am 5f126c0d: am e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part of fix for libmedia OOB write anywhere" into lmp-dev by Abhishek Arya · 10 years ago
  21. b82f33e am 71dc4564: (-s ours) am c9a3ea62: am b70b09c9: Merge "OMXCodec: fix potential OOB read in parseHEVCCodecSpecificData" by Robert Shih · 10 years ago
  22. 3728b8c am de29bee2: (-s ours) resolved conflicts for merge of 69a4f949 to mnc-dev-plus-aosp by Marco Nelissen · 10 years ago
  23. 47d9ac6 am a3e159db: (-s ours) am 588d7b8d: am 1c12b44c: (-s ours) am e9b4f50e: am 386c576a: am e534b0e8: am 00880781: am f839b2a3: (-s ours) am 5aa887ef: am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73 by Marco Nelissen · 10 years ago
  24. 74d3b2c am 915cec98: (-s ours) am efbc1bc8: am 32fe0815: am c663f602: am c03cf67e: am a3cc3272: am d4f0d88e: resolved conflicts for merge of eb10ccbc to lmp-dev by Marco Nelissen · 10 years ago
  25. 753bbe7 am dce9aa02: (-s ours) am 7a4cfed7: am 49cfd200: am 35fbcdd6: am 3d97de8c: am b8a84e59: am ef87594b: Merge "libstagefright: Fix crash in convertMetaDataToMessage" into lmp-dev by Nick Kralevich · 10 years ago
  26. 80534c7 am 2c9e95e9: (-s ours) am 01afbf07: am fbac8266: am a205e4ae: am 9b6d2426: am bd96da22: am b53cdf49: am d7c205fe: am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev by Wei Jia · 10 years ago
  27. ff176b2 am 3504b957: (-s ours) am fb5c8f44: am 99187615: am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev by Abhishek Arya · 10 years ago
  28. 9598076 am 714b35f0: (-s ours) am 2946707b: am b49b1af0: am f526f687: am a07ad890: am 776bfd80: am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-dev by Marco Nelissen · 10 years ago
  29. 285d727 am c5fe92c9: (-s ours) am ddb63b46: am f8f0e0b7: am 562be234: am f076fabf: am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD by Wei Jia · 10 years ago
  30. 8e6d3ee am 5addf277: (-s ours) am 1e97d490: am 7c6a8141: am e4bcb3f8: am 238a487a: am e3cb2507: am 4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev by Wei Jia · 10 years ago
  31. b64e4f8 am c3e2dc4e: (-s ours) am 4a31f533: am 34272233: am 3dcb448f: am 4bb01def: am 84a4221e: am a9b3cd3c: am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp. by Wei Jia · 10 years ago
  32. 10207f5 am 51121ea9: (-s ours) am e7047a6b: am dbdcecd6: (-s ours) am 8df49713: am 603d35e1: am 096a931e: am fd5942b3: am 6b52d191: (-s ours) am 916a9684: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-dev by Eric Laurent · 10 years ago
  33. a2f62b6 am e06c47e2: (-s ours) am d3f4c398: am 899ad39b: am ba20a086: am bc167f83: resolved conflicts for merge of 84fb58bd to lmp-mr1-dev by Eric Laurent · 10 years ago
  34. 6665ae5 am a48f431f: (-s ours) am 3ec4f550: Merge "libstagefright: fix overflow in pvdec_api.cpp." into mnc-dev by Wei Jia · 10 years ago
  35. b690a46 am cfc3246a: (-s ours) am 1bbf2488: Merge "libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets." into mnc-dev by Abhishek Arya · 10 years ago
  36. f2a1cc8 am c7c651af: (-s ours) am ece214ec: am d9f0be89: (-s ours) am d1884052: am bfadec12: am 25c00122: am 4ce86e78: am 5d7a381b: am 877c76ac: Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev by Chong Zhang · 10 years ago
  37. 2cd7451 am adf0a6dc: (-s ours) am 06d7e4d3: am c8d5d078: am 9e01d68b: am 64459f96: am 3e9ed500: am 8a1a5d17: am 9707195b: am f97b6bee: Merge "Check integer overflow to prevent memory corruption" into klp-dev by Jon Larimer · 10 years ago
  38. fcaf0d9 am 4ffd724e: (-s ours) am beb82576: am 9eea72ab: (-s ours) am d223d9bb: am 7ba8b9f8: am fc26577c: am 698ff79c: am 27362395: (-s ours) am 2ed42aea: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into klp-dev by Jon Larimer · 10 years ago
  39. 4e8e08d am e1390fbc: (-s ours) am 75d3927a: am 23565920: am a598bac2: am a3a29952: am 4b153ff9: am 2f3c04a4: resolved conflicts for merge of 6035c811 to lmp-dev by Nick Kralevich · 10 years ago
  40. 9fb78ad am 5b9c7e7a: (-s ours) am 5f78bd4b: am c5a1824f: am ccf0e448: am 6f0b1b3e: am 484ebc81: am a1e462e5: am 0afecdeb: am aa1cc741: Merge "Check buffer size before using it" into klp-dev by Jon Larimer · 10 years ago
  41. 9a1a67d am 536e0e1a: (-s ours) am 927d1674: am 75f60435: am 527ad688: am 8a83ce9c: am 54ea6c02: am 5ff4bb7a: am 8026ad38: am 6efa86be: Merge "Check vector size before accessing" into klp-dev by Abhishek Arya · 10 years ago
  42. fb21427 am 84f61436: (-s ours) am eabd60a2: am 0742dd1d: am cce066d6: am 3459ea26: am de47cd3c: am 3b77e940: am d146d466: am 6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev by Abhishek Arya · 10 years ago
  43. a15c583 am 8b15052c: (-s ours) am a4ebdaad: am 0cc0d158: am 06682f94: am 48bdf782: am 00887af1: am e9a8362e: am a2a68264: am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354 by Neel Mehta · 10 years ago
  44. 7147de4 am 7e767298: (-s ours) am 3c376c6f: am 3e15e6d7: am 6e2dd587: am 8b0660e0: am 3c803e7f: am 6afd8574: am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev by Abhishek Arya · 10 years ago
  45. abad29c am 9dffcd28: (-s ours) am 647adb51: am 39f23993: am 06a1b202: am 5d629bf2: am 93bc6176: am 01841c73: am af46239a: am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4 by Abhishek Arya · 10 years ago
  46. 8d7d1df am e42d7fb5: (-s ours) am e4afd21c: am a6f0b041: am f153ecd2: am 91c71293: am 91fc84f2: am de5c4c46: am 43131299: am 1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev by Wei Jia · 10 years ago
  47. 54e849d am f4332740: (-s ours) am 81d1f324: am 123c013b: am 7bc20ac5: am cc3411e3: am 0bf31aeb: am 9359e822: am 8a34499a: am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4 by Abhishek Arya · 10 years ago
  48. 801d2d6 am 00c1ad5d: (-s ours) am 9791b355: am 6e2d27a9: am d3d84fe6: am 374e600c: am 0a427176: am d3b0f865: am ce380290: (-s ours) am 567b6551: Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev by Wei Jia · 10 years ago
  49. baa4093 am 51b9866b: (-s ours) am 4976b82c: am 02a65c4f: (-s ours) am 8910f92a: am 2ea335b1: am fecbc5da: am 5b4a5cce: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into lmp-dev by Jon Larimer · 10 years ago
  50. ca6e9f4 am 7021fe59: (-s ours) am d60ec30a: am 612cf86e: am a2c49ff4: am afa0e369: am cad46fbd: am f1a93e47: Merge "SoftOpus: Fix output buffer capacity." into lmp-dev by Jon Larimer · 10 years ago
  51. d5910fb am 9dcfe411: (-s ours) am 7c415afd: am 90be27c6: am 4c5695d8: am f248e3ae: am 8369ac13: am 33235986: am 09c29ec4: am 94c1969c: Merge "libstagefright: check memory size for overflow before allocation." into klp-dev by Abhishek Arya · 10 years ago
  52. 5820843 am 7cb87ed1: (-s ours) am 71d4527d: am f81667bc: am 228c3de3: am ccc02053: am ef2c6e04: am 45e493e4: Merge "Merge commit \'5a289b87\' into HEAD" into lmp-dev by Wei Jia · 10 years ago
  53. 6f34bd6 am 22f74ac1: (-s ours) am bc76a890: am 4ac61017: am 051b8572: am 91860b89: SoftAVCEncoder: fix auto merge error, member names have changed. by Wei Jia · 10 years ago
  54. 92f0611 am b7b1a854: (-s ours) am bfadc03a: am 5bb0a2cf: am e264b770: am d9d6c465: am 5d1e62e2: am 9cebcc5f: Merge "SoftAVCEncoder: fix mismatched type for comparison." into lmp-dev by Wei Jia · 10 years ago
  55. ead2852 am e1714496: (-s ours) am 7b0e6b0d: am fe8f7943: am 2cb6f18d: am c7bf75c3: am 138f44a1: am 7d113a23: am 6d59c11c: (-s ours) am fc8c226b: Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev by Wei Jia · 10 years ago
  56. 1430505 am 00b8404b: (-s ours) am 7ceffa7e: am dc953306: am 4f0ff02b: am 46f7acbb: am 3175ff3f: am 90eee339: am 652926c8: am 74d3170f: Merge "Fix comparison sign warnings." into klp-dev by Wei Jia · 10 years ago
  57. fa2bc91 am dc664276: (-s ours) am ad1ce71a: am 96a09849: am 50b600d6: am ab33de61: am 78df80c2: am 65842db0: Merge commit \'b46eb8d9\' into HEAD by Wei Jia · 10 years ago
  58. 9f1fb17 am 1dfbd76b: (-s ours) am 4a6807bb: Merge "Sanity check padding/delay values for gapless playback" into mnc-dev by Marco Nelissen · 10 years ago
  59. 7f7968f am 932d7c15: (-s ours) am ce0e36be: Merge "skip dropped frame without timestamp checking" into mnc-dev by Chong Zhang · 10 years ago
  60. a400618 am fd930f1b: (-s ours) am 3ad0357a: am d7c2effc: Merge "Prevent integer underflows in ID3::Iterator" by Robert Shih · 10 years ago
  61. e4ea377 am 7af84976: (-s ours) am 3cef9257: Merge "Part of fix for libmedia OOB write anywhere" into mnc-dev by Jeff Tinker · 10 years ago
  62. 438a301 am 8c444ed7: (-s ours) am f271ddd4: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into mnc-dev by Wei Jia · 10 years ago
  63. 1dfe4b1 am d5037b35: (-s ours) am 1cb6d761: Merge "libstagefright: fix overflow in SoftAVCEnc." into mnc-dev by Wei Jia · 10 years ago
  64. abf70d8 am 7a64655b: (-s ours) am c08872f9: Merge "NuPlayerRenderer: handle error when resuming an offloaded track" into mnc-dev by Eric Laurent · 10 years ago
  65. 79b7ab9 am dd53622c: (-s ours) am 39ff8149: Merge "libstagefright: fix possible overflow in SampleTable.cpp" into mnc-dev by Wei Jia · 10 years ago
  66. 9640ed2 am 50369c5d: (-s ours) am 3bf1e0fd: libstagefright: check remaining data size before parsing it. by Wei Jia · 10 years ago
  67. 9cb4089 am 4da4c47c: (-s ours) am 4883125b: Merge "do not dequeue from native window after we hit fatal error" into mnc-dev by Chong Zhang · 10 years ago
  68. 506e853 am a1bf05b2: (-s ours) am bad4358c: Camera: Add camera type to ICameraService.getNumberOfCameras. by Eino-Ville Talvala · 10 years ago
  69. 3eca8d2 am ae25903e: (-s ours) am 49f0246c: am d6d7296d: (-s ours) am 880323a2: am 2c0adb69: am 6faf4618: am e4ac35fa: DO NOT MERGE - IAudioFlinger: add checks on binder calls by Eric Laurent · 10 years ago
  70. bb6b0c0 am 34066248: (-s ours) am 3ba0c6ec: Merge "Fix deadlock conditions in Camera3Device." into mnc-dev by Ruben Brunk · 10 years ago
  71. ea3bf65 am 1e07d89c: (-s ours) am a45ccfb8: am b9b2eee2: (-s ours) am f311db04: am 2517d62a: Merge "DO NOT MERGE - IAudioFlinger: add checks on binder calls" into lmp-mr1-dev by Eric Laurent · 10 years ago
  72. a4ece83 am 99dd8116: (-s ours) am 14cf4f0f: am c7a58efa: am def6aff8: am 1c4549c3: am 84a131f2: am 39ab7cea: am 88aa97ea: am 3ce29384: libstagefright: fix possible overflow in amrwbenc. by Wei Jia · 10 years ago
  73. d1c5cb5 am 0fcf36b1: (-s ours) am 835988a0: am e1d095fa: Merge "MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX" by Jon Larimer · 10 years ago
  74. f15e1d7 am f0ff2fbe: (-s ours) am fe65140b: am 59a385e4: am f66b81e7: am f22da1cf: am d7146ce7: am 3bb658ac: am 4e86a483: am f51115bd: libstagefright: fix possible overflow in ID3. by Wei Jia · 10 years ago
  75. ea5a4cd am 98841d36: (-s ours) resolved conflicts for merge of bb37e84f to mnc-dev-plus-aosp by Ian Pedowitz · 10 years ago
  76. 732a506 am 8bfa8145: (-s ours) am 57323866: Merge "Camera3Device: Relax InFlightMap size check" into mnc-dev by Chien-Yu Chen · 10 years ago
  77. 2eb7e24 am d6847e10: (-s ours) am 67072a8a: am 913efd2b: Merge "h264dec: Use intptr_t when a pointer is treated as an integer" by Andy Hung · 10 years ago
  78. 2c20620 am 08fd70bf: (-s ours) resolved conflicts for merge of ab3df6d8 to mnc-dev-plus-aosp by Elliott Hughes · 10 years ago
  79. 92d1014 am bc5ab4e2: (-s ours) am 4327df2a: Merge "Camera: Allocate correctly-sized buffers for DEPTH_POINT_CLOUD" into mnc-dev by Eino-Ville Talvala · 10 years ago
  80. a510099 am c85c0d96: (-s ours) Merge "Stagefright: Remove unused variables and files" into mnc-dev-plus-aosp by Andreas Gampe · 10 years ago
  81. 2e95614 am 070e8001: (-s ours) am 09da8691: libstagefright: fix possible overflow in ID3. by Wei Jia · 10 years ago
  82. 3439285 am aba5df31: (-s ours) am fa8ebb45: Check integer overflow to prevent memory corruption by Jeff Tinker · 10 years ago
  83. c1e758d am 5d247833: (-s ours) am 0a1318c8: am bc2d3eba: Merge "h264_enc: Add test" by Andy Hung · 10 years ago
  84. 9696359 am 61473913: (-s ours) am d199a019: am ff30d69c: Merge "h263_enc: Add test" by Andy Hung · 10 years ago
  85. 4658212 am 63c70b46: (-s ours) am 093c1cbf: am 8fb933c6: Merge "Add test for AMR-WB decoder" by Andy Hung · 10 years ago
  86. 3abb48e am e9ea92c6: (-s ours) am 88122d1c: am bb3e69de: Merge "AMR-WB Encoder: Enable sample app" by Andy Hung · 10 years ago
  87. 017cf34 am 060abccc: (-s ours) am 3192cbda: am 5cc5fd61: Merge "AMR-NB encoder: Add test" by Andy Hung · 10 years ago
  88. 9d34804 am f1333994: (-s ours) am 11f84239: am f98021ce: Merge "Add test for mp3 decoder" by Andy Hung · 10 years ago
  89. 19f3c6a6 am 9df5437f: (-s ours) am 123e0f44: Merge "audio policy: protect capture from telephony RX path." into mnc-dev by Eric Laurent · 10 years ago
  90. e2f63b3 am a00c77c2: (-s ours) am c94caa14: am b07c4a8d: am f86b266c: am 2c181bec: am 7f6a36d2: am b6131acd: am 94f8150b: resolved conflicts for merge of c86eae32 to klp-modular-dev by Nick Kralevich · 10 years ago
  91. d93eec6 am 71a1f3c9: (-s ours) am 9195d57f: Merge "NuPlayer: set video surface directly when NuPlayer has not started yet." into mnc-dev by Wei Jia · 10 years ago
  92. 342e637 am dfd2e453: (-s ours) am 725569fd: am e3884972: Merge "Don\'t use `register`." by Dan Albert · 10 years ago
  93. 7ccbe63 am f817c9c5: (-s ours) am 9872cdce: am 5aa85d05: am 74cda34a: am 41d93c2f: am c88ddfc0: am 2abbc048: am ba34c2ba: am f59348ed: am 0080e03e: am 3ebcce0e: am 2c0f9591: am fea5921b: am 9fff1d37: am d9d35098: am af6b3a6b: am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_s by Nick Kralevich · 10 years ago
  94. ad98f97 am 014c9004: (-s ours) am ab98ee22: am f647c38a: am 648ec9da: am 92b5c47a: am 32739430: am fbf55d85: am 80c17e0d: am 450e1015: Fix Ogg album art by Marco Nelissen · 10 years ago
  95. 2e93d0b am a45bf21f: (-s ours) am 30b93642: am b3adb709: am 6323529b: am 2424d28b: am c40ef744: am af3c0475: am 9c67741f: am 2e637bfd: Merge "Extra sanity checks on sample size and resolution" into klp-dev by Marco Nelissen · 10 years ago
  96. a6133aa am 4b4cd28e: (-s ours) am 190dfbdb: Merge "Fix Ogg album art" into mnc-dev by Marco Nelissen · 10 years ago
  97. e6e7a70 am 2e5fdda1: (-s ours) am 7f9913d4: am 701e0536: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" by Nick Kralevich · 10 years ago
  98. 1272a06 am 3e0bc97d: (-s ours) am aa7a4eae: am daee18a3: am 9b9e8c6f: am 8fec74bd: am b3949ea5: am 72abba8b: am 276cec63: am 4254be9a: am 9364bdc9: am 905aae46: am 11c88f66: am 2796ba1c: am a555788d: am 0e33cb2d: am e4ccf3a1: am 3329a19b: am c87faed6: Fix integer underflow in covr MPEG by Joshua J. Drake · 10 years ago
  99. cfd2d12 am fa7c9d17: (-s ours) am 1d467a73: am 8b1956f0: am 6ad451bb: am 4c0569ee: am 38b7324c: am 437d47cb: am f13cc52d: am 8e0e43d2: am 3621c056: am bcc8e581: am bb99a362: am 8d60fc3e: am 338bbf53: am fd334e34: am 03d539a7: am a5b9055d: am f1ce97dd: Fix integer overflow when handling by Joshua J. Drake · 10 years ago
  100. 4c694b3 am b6166af7: (-s ours) am 45b821df: am ef426568: am 3b7ca5d1: am efc51f0f: am 93a8df0e: am 61934faf: am 94012bc3: am ffe509ff: am d0af1ded: (-s ours) am a421314f: am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp by Nick Kralevich · 10 years ago