Gitiles
Code Review Sign In
gerrit.omnirom.org / android_frameworks_av / aadc29b910a22c1d2b422d5a96faef07dfc97292
  1. aadc29b Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a30 am: 4c31eb2675 -s ours am: db358e20c6 am: d03ad9148a am: 92106db5fd am: d27738c973 -s ours am: 9934c7d715 am: ccf2518644 am: cf199260de am: d8d4f9ad23 by Marco Nelissen · 9 years ago
  2. b186eb7 DO NOT MERGE Fix divide by zero am: bc08b17c57 am: 7525a44f22 -s ours am: 9c6eda244c am: 9872d49f32 am: 9195b00e32 am: ae5c6c5a26 -s ours am: a303b61086 am: c5c549f4aa am: 834768063c am: 49bf5aa65b by Marco Nelissen · 9 years ago
  3. 52e747e Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a30 am: 4c31eb2675 -s ours am: db358e20c6 am: d03ad9148a am: 92106db5fd am: d27738c973 -s ours am: 9934c7d715 am: ccf2518644 am: cf199260de by Marco Nelissen · 9 years ago
  4. 8b7c223 DO NOT MERGE Fix divide by zero am: bc08b17c57 am: 7525a44f22 -s ours am: 9c6eda244c am: 9872d49f32 am: 9195b00e32 am: ae5c6c5a26 -s ours am: a303b61086 am: c5c549f4aa am: 834768063c by Marco Nelissen · 9 years ago
  5. d8d4f9a Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a30 am: 4c31eb2675 -s ours am: db358e20c6 am: d03ad9148a am: 92106db5fd am: d27738c973 -s ours am: 9934c7d715 am: ccf2518644 by Marco Nelissen · 9 years ago
  6. 49bf5aa DO NOT MERGE Fix divide by zero am: bc08b17c57 am: 7525a44f22 -s ours am: 9c6eda244c am: 9872d49f32 am: 9195b00e32 am: ae5c6c5a26 -s ours am: a303b61086 am: c5c549f4aa by Marco Nelissen · 9 years ago
  7. cf19926 Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a30 am: 4c31eb2675 -s ours am: db358e20c6 am: d03ad9148a am: 92106db5fd am: d27738c973 -s ours am: 9934c7d715 by Marco Nelissen · 9 years ago
  8. 8347680 DO NOT MERGE Fix divide by zero am: bc08b17c57 am: 7525a44f22 -s ours am: 9c6eda244c am: 9872d49f32 am: 9195b00e32 am: ae5c6c5a26 -s ours am: a303b61086 by Marco Nelissen · 9 years ago
  9. ccf2518 Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a30 am: 4c31eb2675 -s ours am: db358e20c6 am: d03ad9148a am: 92106db5fd am: d27738c973 -s ours by Marco Nelissen · 9 years ago
  10. c5c549f DO NOT MERGE Fix divide by zero am: bc08b17c57 am: 7525a44f22 -s ours am: 9c6eda244c am: 9872d49f32 am: 9195b00e32 am: ae5c6c5a26 -s ours by Marco Nelissen · 9 years ago
  11. 9934c7d Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a30 am: 4c31eb2675 -s ours am: db358e20c6 am: d03ad9148a am: 92106db5fd by Marco Nelissen · 9 years ago
  12. a303b61 DO NOT MERGE Fix divide by zero am: bc08b17c57 am: 7525a44f22 -s ours am: 9c6eda244c am: 9872d49f32 am: 9195b00e32 by Marco Nelissen · 9 years ago
  13. d27738c Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a30 am: 4c31eb2675 -s ours am: db358e20c6 am: d03ad9148a by Marco Nelissen · 9 years ago
  14. ae5c6c5 DO NOT MERGE Fix divide by zero am: bc08b17c57 am: 7525a44f22 -s ours am: 9c6eda244c am: 9872d49f32 by Marco Nelissen · 9 years ago
  15. 92106db Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a30 am: 4c31eb2675 -s ours am: db358e20c6 by Marco Nelissen · 9 years ago
  16. 9195b00 DO NOT MERGE Fix divide by zero am: bc08b17c57 am: 7525a44f22 -s ours am: 9c6eda244c by Marco Nelissen · 9 years ago
  17. d03ad91 Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a30 am: 4c31eb2675 -s ours by Marco Nelissen · 9 years ago
  18. 9872d49 DO NOT MERGE Fix divide by zero am: bc08b17c57 am: 7525a44f22 -s ours by Marco Nelissen · 9 years ago
  19. db358e2 Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a30 by Marco Nelissen · 9 years ago
  20. 9c6eda2 DO NOT MERGE Fix divide by zero am: bc08b17c57 am: 7525a44f22 -s ours by Marco Nelissen · 9 years ago
  21. 4c31eb2 Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a30 by Marco Nelissen · 9 years ago
  22. 7525a44 DO NOT MERGE Fix divide by zero am: bc08b17c57 by Marco Nelissen · 9 years ago
  23. b6cf6d6 Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev by Marco Nelissen · 9 years ago
  24. 0a2e01a Merge "AudioTrack: Add hasStarted method" by Andy Hung · 9 years ago
  25. c6ef32c Merge "AudioTrack: Clear stream end flag on start" by Andy Hung · 9 years ago
  26. 1ef6aec Merge "Fix divide by zero" into lmp-dev am: ef6934cdf9 am: cd1950301d am: 79a5c7031e am: d066317386 am: 5282b30565 am: 46b2338884 am: ecd361b12a am: bd52a5c4b7 am: 437775847d am: 1e53256736 am: fd6d0a135a by Marco Nelissen · 9 years ago
  27. 2ca283c Fix divide by zero am: 12416c4125 -s ours am: e1fff04cd9 am: fee873d950 am: 45c32466f8 am: 9f52131d2e am: 4d0520e1c0 am: 6b86204ee0 am: 364df512fa am: 263c57aa1f am: 4caa21fbcb am: c51ee6342a by Marco Nelissen · 9 years ago
  28. 99bcf57 Merge "Fix divide by zero" into lmp-dev am: ef6934cdf9 am: cd1950301d am: 79a5c7031e am: d066317386 am: 5282b30565 am: 46b2338884 am: ecd361b12a am: bd52a5c4b7 am: 437775847d am: 1e53256736 by Marco Nelissen · 9 years ago
  29. f9a55a4 Fix divide by zero am: 12416c4125 -s ours am: e1fff04cd9 am: fee873d950 am: 45c32466f8 am: 9f52131d2e am: 4d0520e1c0 am: 6b86204ee0 am: 364df512fa am: 263c57aa1f am: 4caa21fbcb by Marco Nelissen · 9 years ago
  30. fd6d0a1 Merge "Fix divide by zero" into lmp-dev am: ef6934cdf9 am: cd1950301d am: 79a5c7031e am: d066317386 am: 5282b30565 am: 46b2338884 am: ecd361b12a am: bd52a5c4b7 am: 437775847d by Marco Nelissen · 9 years ago
  31. c51ee63 Fix divide by zero am: 12416c4125 -s ours am: e1fff04cd9 am: fee873d950 am: 45c32466f8 am: 9f52131d2e am: 4d0520e1c0 am: 6b86204ee0 am: 364df512fa am: 263c57aa1f by Marco Nelissen · 9 years ago
  32. 1e53256 Merge "Fix divide by zero" into lmp-dev am: ef6934cdf9 am: cd1950301d am: 79a5c7031e am: d066317386 am: 5282b30565 am: 46b2338884 am: ecd361b12a am: bd52a5c4b7 by Marco Nelissen · 9 years ago
  33. 4caa21f Fix divide by zero am: 12416c4125 -s ours am: e1fff04cd9 am: fee873d950 am: 45c32466f8 am: 9f52131d2e am: 4d0520e1c0 am: 6b86204ee0 am: 364df512fa by Marco Nelissen · 9 years ago
  34. 4377758 Merge "Fix divide by zero" into lmp-dev am: ef6934cdf9 am: cd1950301d am: 79a5c7031e am: d066317386 am: 5282b30565 am: 46b2338884 am: ecd361b12a by Marco Nelissen · 9 years ago
  35. 263c57a Fix divide by zero am: 12416c4125 -s ours am: e1fff04cd9 am: fee873d950 am: 45c32466f8 am: 9f52131d2e am: 4d0520e1c0 am: 6b86204ee0 by Marco Nelissen · 9 years ago
  36. bd52a5c Merge "Fix divide by zero" into lmp-dev am: ef6934cdf9 am: cd1950301d am: 79a5c7031e am: d066317386 am: 5282b30565 am: 46b2338884 by Marco Nelissen · 9 years ago
  37. 364df51 Fix divide by zero am: 12416c4125 -s ours am: e1fff04cd9 am: fee873d950 am: 45c32466f8 am: 9f52131d2e am: 4d0520e1c0 by Marco Nelissen · 9 years ago
  38. ecd361b Merge "Fix divide by zero" into lmp-dev am: ef6934cdf9 am: cd1950301d am: 79a5c7031e am: d066317386 am: 5282b30565 by Marco Nelissen · 9 years ago
  39. 6b86204 Fix divide by zero am: 12416c4125 -s ours am: e1fff04cd9 am: fee873d950 am: 45c32466f8 am: 9f52131d2e by Marco Nelissen · 9 years ago
  40. 46b2338 Merge "Fix divide by zero" into lmp-dev am: ef6934cdf9 am: cd1950301d am: 79a5c7031e am: d066317386 by Marco Nelissen · 9 years ago
  41. 4d0520e Fix divide by zero am: 12416c4125 -s ours am: e1fff04cd9 am: fee873d950 am: 45c32466f8 by Marco Nelissen · 9 years ago
  42. 5282b30 Merge "Fix divide by zero" into lmp-dev am: ef6934cdf9 am: cd1950301d am: 79a5c7031e by Marco Nelissen · 9 years ago
  43. 9f52131 Fix divide by zero am: 12416c4125 -s ours am: e1fff04cd9 am: fee873d950 by Marco Nelissen · 9 years ago
  44. d066317 Merge "Fix divide by zero" into lmp-dev am: ef6934cdf9 am: cd1950301d by Marco Nelissen · 9 years ago
  45. 45c3246 Fix divide by zero am: 12416c4125 -s ours am: e1fff04cd9 am: fee873d950 by Marco Nelissen · 9 years ago
  46. 79a5c70 Merge "Fix divide by zero" into lmp-dev am: ef6934cdf9 am: cd1950301d by Marco Nelissen · 9 years ago
  47. fee873d Fix divide by zero am: 12416c4125 -s ours am: e1fff04cd9 by Marco Nelissen · 9 years ago
  48. bc08b17 DO NOT MERGE Fix divide by zero by Marco Nelissen · 9 years ago
  49. cd19503 Merge "Fix divide by zero" into lmp-dev am: ef6934cdf9 by Marco Nelissen · 9 years ago
  50. e1fff04 Fix divide by zero am: 12416c4125 -s ours by Marco Nelissen · 9 years ago
  51. 65ffdfc AudioTrack: Add hasStarted method by Andy Hung · 9 years ago
  52. ef6934c Merge "Fix divide by zero" into lmp-dev by Marco Nelissen · 9 years ago
  53. 4be3b83 AudioTrack: Clear stream end flag on start by Andy Hung · 9 years ago
  54. 625300b Merge "NuPlayer: use width and height from tkhd for display and thumbnail." by Wei Jia · 9 years ago
  55. 61a4fac Remove dependencies on hardware/audio_policy.h by Mikhail Naganov · 9 years ago
  56. 61787b2 Merge "Remove dependencies on hardware/audio_effects.h and EffectsFactoryApi.h" by Mikhail Naganov · 9 years ago
  57. 568cf0c Merge "Fix issues with metadata handling when format change happens" am: 92047ec34b am: d41a64c7ad am: 2a02f18cf1 by Marco Nelissen · 9 years ago
  58. a2e99a3 Merge "Fix issues with metadata handling when format change happens" am: 92047ec34b am: d41a64c7ad by Marco Nelissen · 9 years ago
  59. 2a02f18 Merge "Fix issues with metadata handling when format change happens" am: 92047ec34b by Marco Nelissen · 9 years ago
  60. d41a64c Merge "Fix issues with metadata handling when format change happens" by Marco Nelissen · 9 years ago
  61. 92047ec Merge "Fix issues with metadata handling when format change happens" by Marco Nelissen · 9 years ago
  62. 1f44934 Merge "rtsp: fix live stream duration reporting" by Robert Shih · 9 years ago
  63. 7b01847 Merge "MediaCodec refactoring part 1-b: secure buffers" by TreeHugger Robot · 9 years ago
  64. 4811923 MediaCodec refactoring part 1-b: secure buffers by Wonsik Kim · 9 years ago
  65. d6f63be Merge "HTTPLiveSource: implement getFormatMeta" into nyc-mr1-dev am: 0afc0f8f3c am: 069372b3f0 by Robert Shih · 9 years ago
  66. 522d9ac HTTPLiveSource: implement getFormatMeta am: a83eebb78c am: 7c55dd0c5b by Robert Shih · 9 years ago
  67. dd5ff66 Merge "HTTPLiveSource: implement getFormatMeta" into nyc-mr1-dev am: 0afc0f8f3c by Robert Shih · 9 years ago
  68. 8b7065b HTTPLiveSource: implement getFormatMeta am: a83eebb78c am: 7c55dd0c5b by Robert Shih · 9 years ago
  69. 069372b Merge "HTTPLiveSource: implement getFormatMeta" into nyc-mr1-dev am: 0afc0f8f3c by Robert Shih · 9 years ago
  70. 7c55dd0 HTTPLiveSource: implement getFormatMeta am: a83eebb78c by Robert Shih · 9 years ago
  71. 0afc0f8 Merge "HTTPLiveSource: implement getFormatMeta" into nyc-mr1-dev by Robert Shih · 9 years ago
  72. 9548771 Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be am: 913b7564c4 -s ours am: 391b2806b5 -s ours am: 172fa07944 am: 8f8e719106 -s ours am: 2f6c5b05f9 am: 29da5c2eba am: 282551278b am: 5a4695b5cb -s ours am: 45a89389ac am: 953b6b19eb am: 00082e26da am: 63425d5b7b by Marco Nelissen · 9 years ago
  73. 4d44647 DO NOT MERGE Fix divide by zero am: febbd52cd9 am: 55ce7e5d1e am: 1b3f61ceaf -s ours am: 76bc4166ce -s ours am: 609964004e am: 93590752b1 -s ours am: a49626e9f9 am: ade3086ef7 am: eb3c705d8c am: 925924329c -s ours am: b4f02ca084 am: 8ddc89db0c am: 1f0726d016 am: 3f94a6140d by Marco Nelissen · 9 years ago
  74. 93dcd27 Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be am: 913b7564c4 -s ours am: 391b2806b5 -s ours am: 172fa07944 am: 8f8e719106 -s ours am: 2f6c5b05f9 am: 29da5c2eba am: 282551278b am: 5a4695b5cb -s ours am: 45a89389ac am: 953b6b19eb am: 00082e26da by Marco Nelissen · 9 years ago
  75. f553deb DO NOT MERGE Fix divide by zero am: febbd52cd9 am: 55ce7e5d1e am: 1b3f61ceaf -s ours am: 76bc4166ce -s ours am: 609964004e am: 93590752b1 -s ours am: a49626e9f9 am: ade3086ef7 am: eb3c705d8c am: 925924329c -s ours am: b4f02ca084 am: 8ddc89db0c am: 1f0726d016 by Marco Nelissen · 9 years ago
  76. e23cabf Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be am: 913b7564c4 -s ours am: 391b2806b5 -s ours am: 172fa07944 am: 8f8e719106 -s ours am: 2f6c5b05f9 am: 29da5c2eba am: 282551278b am: 5a4695b5cb -s ours am: 45a89389ac am: a6e2521999 by Marco Nelissen · 9 years ago
  77. 698abdd DO NOT MERGE Fix divide by zero am: febbd52cd9 am: 55ce7e5d1e am: 1b3f61ceaf -s ours am: 76bc4166ce -s ours am: 609964004e am: 93590752b1 -s ours am: a49626e9f9 am: ade3086ef7 am: eb3c705d8c am: 925924329c -s ours am: b4f02ca084 am: 812e3f5b37 by Marco Nelissen · 9 years ago
  78. 63425d5 Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be am: 913b7564c4 -s ours am: 391b2806b5 -s ours am: 172fa07944 am: 8f8e719106 -s ours am: 2f6c5b05f9 am: 29da5c2eba am: 282551278b am: 5a4695b5cb -s ours am: 45a89389ac am: 953b6b19eb by Marco Nelissen · 9 years ago
  79. 3f94a61 DO NOT MERGE Fix divide by zero am: febbd52cd9 am: 55ce7e5d1e am: 1b3f61ceaf -s ours am: 76bc4166ce -s ours am: 609964004e am: 93590752b1 -s ours am: a49626e9f9 am: ade3086ef7 am: eb3c705d8c am: 925924329c -s ours am: b4f02ca084 am: 8ddc89db0c by Marco Nelissen · 9 years ago
  80. 00082e2 Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be am: 913b7564c4 -s ours am: 391b2806b5 -s ours am: 172fa07944 am: 8f8e719106 -s ours am: 2f6c5b05f9 am: 29da5c2eba am: 282551278b am: 5a4695b5cb -s ours am: 45a89389ac by Marco Nelissen · 9 years ago
  81. 68c0520 Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be am: 913b7564c4 -s ours am: 391b2806b5 -s ours am: 172fa07944 am: 8f8e719106 -s ours am: 2f6c5b05f9 am: 29da5c2eba am: 282551278b am: 5a4695b5cb -s ours am: 45a89389ac by Marco Nelissen · 9 years ago
  82. 1f0726d DO NOT MERGE Fix divide by zero am: febbd52cd9 am: 55ce7e5d1e am: 1b3f61ceaf -s ours am: 76bc4166ce -s ours am: 609964004e am: 93590752b1 -s ours am: a49626e9f9 am: ade3086ef7 am: eb3c705d8c am: 925924329c -s ours am: b4f02ca084 by Marco Nelissen · 9 years ago
  83. 96d4f91 DO NOT MERGE Fix divide by zero am: febbd52cd9 am: 55ce7e5d1e am: 1b3f61ceaf -s ours am: 76bc4166ce -s ours am: 609964004e am: 93590752b1 -s ours am: a49626e9f9 am: ade3086ef7 am: eb3c705d8c am: 925924329c -s ours am: b4f02ca084 by Marco Nelissen · 9 years ago
  84. be01e20 Merge "DO NOT MERGE Fix divide by zero" into mnc-dev am: ec206acb99 am: 69db172b16 am: a99878f636 am: 9c950265b8 -s ours am: f4cb32f44b am: bd52585dd1 am: 297bb1a1b7 am: 90c63dbe37 by Marco Nelissen · 9 years ago
  85. e2773f9 DO NOT MERGE Fix divide by zero am: 2e211d38a3 am: 52e86acf03 am: 1607de251e am: c3c3ae039a -s ours am: f4211ba53a am: a38f9d17c6 am: 6100f3248f am: 69a4089f50 by Marco Nelissen · 9 years ago
  86. e16dcfc Merge "DO NOT MERGE Fix divide by zero" into mnc-dev am: ec206acb99 am: 69db172b16 am: a99878f636 am: 9c950265b8 -s ours am: f4cb32f44b am: bd52585dd1 am: 297bb1a1b7 by Marco Nelissen · 9 years ago
  87. 43f24b5 DO NOT MERGE Fix divide by zero am: 2e211d38a3 am: 52e86acf03 am: 1607de251e am: c3c3ae039a -s ours am: f4211ba53a am: a38f9d17c6 am: 6100f3248f by Marco Nelissen · 9 years ago
  88. 953b6b1 Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be am: 913b7564c4 -s ours am: 391b2806b5 -s ours am: 172fa07944 am: 8f8e719106 -s ours am: 2f6c5b05f9 am: 29da5c2eba am: 282551278b am: 5a4695b5cb -s ours by Marco Nelissen · 9 years ago
  89. a6e2521 Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be am: 913b7564c4 -s ours am: 391b2806b5 -s ours am: 172fa07944 am: 8f8e719106 -s ours am: 2f6c5b05f9 am: 29da5c2eba am: 282551278b am: 5a4695b5cb -s ours by Marco Nelissen · 9 years ago
  90. 8ddc89d DO NOT MERGE Fix divide by zero am: febbd52cd9 am: 55ce7e5d1e am: 1b3f61ceaf -s ours am: 76bc4166ce -s ours am: 609964004e am: 93590752b1 -s ours am: a49626e9f9 am: ade3086ef7 am: eb3c705d8c am: 925924329c -s ours by Marco Nelissen · 9 years ago
  91. 812e3f5 DO NOT MERGE Fix divide by zero am: febbd52cd9 am: 55ce7e5d1e am: 1b3f61ceaf -s ours am: 76bc4166ce -s ours am: 609964004e am: 93590752b1 -s ours am: a49626e9f9 am: ade3086ef7 am: eb3c705d8c am: 925924329c -s ours by Marco Nelissen · 9 years ago
  92. 45a8938 Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be am: 913b7564c4 -s ours am: 391b2806b5 -s ours am: 172fa07944 am: 8f8e719106 -s ours am: 2f6c5b05f9 am: 29da5c2eba am: 282551278b by Marco Nelissen · 9 years ago
  93. b4f02ca DO NOT MERGE Fix divide by zero am: febbd52cd9 am: 55ce7e5d1e am: 1b3f61ceaf -s ours am: 76bc4166ce -s ours am: 609964004e am: 93590752b1 -s ours am: a49626e9f9 am: ade3086ef7 am: eb3c705d8c by Marco Nelissen · 9 years ago
  94. 5a4695b Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be am: 913b7564c4 -s ours am: 391b2806b5 -s ours am: 172fa07944 am: 8f8e719106 -s ours am: 2f6c5b05f9 am: 29da5c2eba by Marco Nelissen · 9 years ago
  95. 9259243 DO NOT MERGE Fix divide by zero am: febbd52cd9 am: 55ce7e5d1e am: 1b3f61ceaf -s ours am: 76bc4166ce -s ours am: 609964004e am: 93590752b1 -s ours am: a49626e9f9 am: ade3086ef7 by Marco Nelissen · 9 years ago
  96. 2825512 Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be am: 913b7564c4 -s ours am: 391b2806b5 -s ours am: 172fa07944 am: 8f8e719106 -s ours am: 2f6c5b05f9 by Marco Nelissen · 9 years ago
  97. eb3c705 DO NOT MERGE Fix divide by zero am: febbd52cd9 am: 55ce7e5d1e am: 1b3f61ceaf -s ours am: 76bc4166ce -s ours am: 609964004e am: 93590752b1 -s ours am: a49626e9f9 by Marco Nelissen · 9 years ago
  98. dda939c Merge "DO NOT MERGE Fix divide by zero" into mnc-dev am: ec206acb99 am: 69db172b16 am: a99878f636 am: 9c950265b8 -s ours am: f4cb32f44b am: b8b862fca0 by Marco Nelissen · 9 years ago
  99. 50563b5 DO NOT MERGE Fix divide by zero am: 2e211d38a3 am: 52e86acf03 am: 1607de251e am: c3c3ae039a -s ours am: f4211ba53a am: f2004d373a by Marco Nelissen · 9 years ago
  100. 29da5c2 Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be am: 913b7564c4 -s ours am: 391b2806b5 -s ours am: 172fa07944 am: 8f8e719106 -s ours by Marco Nelissen · 9 years ago