1. d41141c resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0 am: 199f36c95a am: fb800b98ed am: f70b522d31 by Marco Nelissen · 8 years ago
  2. 20d68e0 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0 am: 199f36c95a am: fb800b98ed by Marco Nelissen · 8 years ago
  3. f70b522 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0 am: 199f36c95a by Marco Nelissen · 8 years ago
  4. fb800b9 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0 by Marco Nelissen · 8 years ago
  5. 199f36c resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 by Marco Nelissen · 8 years ago
  6. c9d4267 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce by Marco Nelissen · 8 years ago
  7. 24058e9 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce by Marco Nelissen · 8 years ago
  8. 86d5e96 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 by Marco Nelissen · 8 years ago
  9. 50358a8 resolve merge conflicts of 79cf158c51 to mnc-dev by Marco Nelissen · 8 years ago
  10. 79cf158 Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d am: 86bd734f58 am: 7902138f2e am: a23c9a47ab by Marco Nelissen · 8 years ago
  11. f8a2e81 Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d am: 86bd734f58 am: 7902138f2e by Marco Nelissen · 8 years ago
  12. a23c9a4 Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d am: 86bd734f58 by Marco Nelissen · 8 years ago
  13. 7902138 Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d by Marco Nelissen · 8 years ago
  14. 86bd734 Merge "stagefright: parseApp check data boundary conditions" into klp-dev by Marco Nelissen · 8 years ago
  15. 65433ff Merge "stagefright: parseApp check data boundary conditions" into klp-dev by Marco Nelissen · 8 years ago
  16. 90084e8 Merge "Turn off overflow protection for various math functions" into nyc-dev am: d51a9b554e am: d4de6c34b7 am: f791b1f376 by Marco Nelissen · 9 years ago
  17. 98e0362 Turn off overflow protection for various math functions am: 42b1ea8a93 am: 0785ced61b am: 6f0b9ca8a5 by Marco Nelissen · 9 years ago
  18. 60721af Merge "Turn off overflow protection for various math functions" into nyc-dev am: d51a9b554e am: d4de6c34b7 by Marco Nelissen · 9 years ago
  19. ef2510a Turn off overflow protection for various math functions am: 42b1ea8a93 am: 0785ced61b by Marco Nelissen · 9 years ago
  20. f791b1f Merge "Turn off overflow protection for various math functions" into nyc-dev am: d51a9b554e by Marco Nelissen · 9 years ago
  21. 6f0b9ca Turn off overflow protection for various math functions am: 42b1ea8a93 by Marco Nelissen · 9 years ago
  22. d4de6c3 Merge "Turn off overflow protection for various math functions" into nyc-dev by Marco Nelissen · 9 years ago
  23. 0785ced Turn off overflow protection for various math functions am: 42b1ea8a93 by Marco Nelissen · 9 years ago
  24. d51a9b5 Merge "Turn off overflow protection for various math functions" into nyc-dev by Marco Nelissen · 9 years ago
  25. ef7329a Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 am: 7a14d95270 am: 888f5bab6d am: a6b1816e16 am: 06f46cabd0 am: 31670090bf am: e1b8152064 am: dd062f9882 am: d373dd0154 am: a6e6e7c5da am: b5485e3455 by Eino-Ville Talvala · 9 years ago
  26. 7ef2218 CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 am: dd82ab2377 am: 1dd068cd45 am: edf9d2f4d1 am: 6ddd08e3a9 am: 0dcc9bb368 am: b739918940 -s ours am: 92d2d4ca3c am: 09b77fbb92 am: 39d454cdd9 by Eino-Ville Talvala · 9 years ago
  27. 5d45e50 Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 am: 7a14d95270 am: 888f5bab6d am: a6b1816e16 am: 06f46cabd0 am: 31670090bf am: e1b8152064 am: dd062f9882 am: d373dd0154 am: a6e6e7c5da by Eino-Ville Talvala · 9 years ago
  28. e0c5f55 CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 am: dd82ab2377 am: 1dd068cd45 am: edf9d2f4d1 am: 6ddd08e3a9 am: 0dcc9bb368 am: b739918940 -s ours am: 92d2d4ca3c am: 09b77fbb92 by Eino-Ville Talvala · 9 years ago
  29. b5485e3 Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 am: 7a14d95270 am: 888f5bab6d am: a6b1816e16 am: 06f46cabd0 am: 31670090bf am: e1b8152064 am: dd062f9882 am: d373dd0154 by Eino-Ville Talvala · 9 years ago
  30. 39d454c CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 am: dd82ab2377 am: 1dd068cd45 am: edf9d2f4d1 am: 6ddd08e3a9 am: 0dcc9bb368 am: b739918940 -s ours am: 92d2d4ca3c by Eino-Ville Talvala · 9 years ago
  31. a6e6e7c Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 am: 7a14d95270 am: 888f5bab6d am: a6b1816e16 am: 06f46cabd0 am: 31670090bf am: e1b8152064 am: dd062f9882 by Eino-Ville Talvala · 9 years ago
  32. 09b77fb CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 am: dd82ab2377 am: 1dd068cd45 am: edf9d2f4d1 am: 6ddd08e3a9 am: 0dcc9bb368 am: b739918940 -s ours by Eino-Ville Talvala · 9 years ago
  33. d373dd0 Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 am: 7a14d95270 am: 888f5bab6d am: a6b1816e16 am: 06f46cabd0 am: 31670090bf am: e1b8152064 by Eino-Ville Talvala · 9 years ago
  34. 92d2d4c CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 am: dd82ab2377 am: 1dd068cd45 am: edf9d2f4d1 am: 6ddd08e3a9 am: 0dcc9bb368 by Eino-Ville Talvala · 9 years ago
  35. dd062f9 Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 am: 7a14d95270 am: 888f5bab6d am: a6b1816e16 am: 06f46cabd0 am: 31670090bf by Eino-Ville Talvala · 9 years ago
  36. b739918 CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 am: dd82ab2377 am: 1dd068cd45 am: edf9d2f4d1 am: 6ddd08e3a9 by Eino-Ville Talvala · 9 years ago
  37. e1b8152 Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 am: 7a14d95270 am: 888f5bab6d am: a6b1816e16 am: 06f46cabd0 by Eino-Ville Talvala · 9 years ago
  38. 0dcc9bb CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 am: dd82ab2377 am: 1dd068cd45 am: edf9d2f4d1 by Eino-Ville Talvala · 9 years ago
  39. 3167009 Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 am: 7a14d95270 am: 888f5bab6d am: a6b1816e16 by Eino-Ville Talvala · 9 years ago
  40. 6ddd08e CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 am: dd82ab2377 am: 1dd068cd45 by Eino-Ville Talvala · 9 years ago
  41. 06f46ca Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 am: 7a14d95270 am: 888f5bab6d by Eino-Ville Talvala · 9 years ago
  42. edf9d2f CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 am: dd82ab2377 by Eino-Ville Talvala · 9 years ago
  43. 9b84b3b Merge "CameraBase: Don't return an sp<> by reference" into nyc-dev am: 41d3046edb am: edac7f768a am: 3a706894c4 by Eino-Ville Talvala · 9 years ago
  44. 74476ff CameraBase: Don't return an sp<> by reference am: f86177dd93 am: e1bdaa8fb1 am: 6cb1912505 by Eino-Ville Talvala · 9 years ago
  45. a6b1816 Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 am: 7a14d95270 by Eino-Ville Talvala · 9 years ago
  46. 1dd068c CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 by Eino-Ville Talvala · 9 years ago
  47. 888f5ba Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 by Eino-Ville Talvala · 9 years ago
  48. dd82ab2 CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d by Eino-Ville Talvala · 9 years ago
  49. b0cc8a7 Merge "CameraBase: Don't return an sp<> by reference" into nyc-dev am: 41d3046edb am: edac7f768a by Eino-Ville Talvala · 9 years ago
  50. 4f95157 CameraBase: Don't return an sp<> by reference am: f86177dd93 am: e1bdaa8fb1 by Eino-Ville Talvala · 9 years ago
  51. 7a14d95 Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f by Eino-Ville Talvala · 9 years ago
  52. 99c4dd2 CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb by Eino-Ville Talvala · 9 years ago
  53. 3a70689 Merge "CameraBase: Don't return an sp<> by reference" into nyc-dev am: 41d3046edb by Eino-Ville Talvala · 9 years ago
  54. f000938 Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 by Eino-Ville Talvala · 9 years ago
  55. 6cb1912 CameraBase: Don't return an sp<> by reference am: f86177dd93 am: e1bdaa8fb1 by Eino-Ville Talvala · 9 years ago
  56. 8806c2a CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb by Eino-Ville Talvala · 9 years ago
  57. 4fca12e Merge "CameraBase: Don't return an sp<> by reference" into klp-dev by Eino-Ville Talvala · 9 years ago
  58. edac7f7 Merge "CameraBase: Don't return an sp<> by reference" into nyc-dev by Eino-Ville Talvala · 9 years ago
  59. e1bdaa8 CameraBase: Don't return an sp<> by reference am: f86177dd93 by Eino-Ville Talvala · 9 years ago
  60. 8c32699 CameraBase: Don't return an sp<> by reference am: 4b49489c12 by Eino-Ville Talvala · 9 years ago
  61. fdf64ba Merge "CameraBase: Don't return an sp<> by reference" into klp-dev by Eino-Ville Talvala · 9 years ago
  62. 41d3046 Merge "CameraBase: Don't return an sp<> by reference" into nyc-dev by Eino-Ville Talvala · 9 years ago
  63. 42b1ea8 Turn off overflow protection for various math functions by Marco Nelissen · 9 years ago
  64. ee721d8 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340 am: d0bc460432 am: 4f34250af7 am: 96f48e1601 am: 1c4083fcbf by Marco Nelissen · 9 years ago
  65. 878b27d Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340 am: d0bc460432 am: 4f34250af7 am: 96f48e1601 by Marco Nelissen · 9 years ago
  66. 1c4083f Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340 am: d0bc460432 am: 4f34250af7 by Marco Nelissen · 9 years ago
  67. 96f48e1 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340 am: d0bc460432 by Marco Nelissen · 9 years ago
  68. 4f34250 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340 by Marco Nelissen · 9 years ago
  69. d0bc460 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 by Marco Nelissen · 9 years ago
  70. 245b572 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 by Marco Nelissen · 9 years ago
  71. 9986938 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f by Marco Nelissen · 9 years ago
  72. 9070697 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d by Marco Nelissen · 9 years ago
  73. 08ccbcc Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b by Marco Nelissen · 9 years ago
  74. bd91a65 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 by Marco Nelissen · 9 years ago
  75. 4c1ad41 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f by Marco Nelissen · 9 years ago
  76. ce9cab3 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e by Marco Nelissen · 9 years ago
  77. aa54980 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e by Marco Nelissen · 9 years ago
  78. 2dd1d5e Revert "Turn off overflow protection for various math functions" by Marco Nelissen · 9 years ago
  79. f86177d CameraBase: Don't return an sp<> by reference by Eino-Ville Talvala · 9 years ago
  80. 2c55e08 Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 am: e7a758e220 am: 350db71bea am: d1cc28471a am: 1212f6e406 am: 415dfd3b95 by Marco Nelissen · 9 years ago
  81. 1c03bbb Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 am: e7a758e220 am: 350db71bea am: d1cc28471a am: 1212f6e406 by Marco Nelissen · 9 years ago
  82. 415dfd3 Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 am: e7a758e220 am: 350db71bea am: d1cc28471a by Marco Nelissen · 9 years ago
  83. 1212f6e Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 am: e7a758e220 am: 350db71bea by Marco Nelissen · 9 years ago
  84. d1cc284 Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 am: e7a758e220 by Marco Nelissen · 9 years ago
  85. 350db71 Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 by Marco Nelissen · 9 years ago
  86. e7a758e Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 by Marco Nelissen · 9 years ago
  87. b0ceb40 Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 by Marco Nelissen · 9 years ago
  88. ba78bee Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 by Marco Nelissen · 9 years ago
  89. c011837 Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec by Marco Nelissen · 9 years ago
  90. 4b49489 CameraBase: Don't return an sp<> by reference by Eino-Ville Talvala · 9 years ago
  91. 1edbc69 Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 by Marco Nelissen · 9 years ago
  92. 3d58f94 Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 by Marco Nelissen · 9 years ago
  93. a25eb35 Turn off overflow protection for various math functions am: cbf5e6915c by Marco Nelissen · 9 years ago
  94. 72b1fdb Turn off overflow protection for various math functions am: cbf5e6915c by Marco Nelissen · 9 years ago
  95. cbf5e69 Turn off overflow protection for various math functions by Marco Nelissen · 9 years ago
  96. 1da5859 DO NOT MERGE Revert "Log audio information to ensure complete delivery" by Andy Hung · 9 years ago
  97. 97b02cc avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875 am: e277181b71 am: 1a9f5250d8 am: 4bf710727b am: 5337437a1c am: 4fa55ddad0 am: dda9763117 by Robert Shih · 9 years ago
  98. e264868 avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875 am: e277181b71 am: 1a9f5250d8 am: 4bf710727b am: 5337437a1c am: 4fa55ddad0 by Robert Shih · 9 years ago
  99. dda9763 avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875 am: e277181b71 am: 1a9f5250d8 am: 4bf710727b am: 5337437a1c by Robert Shih · 9 years ago
  100. 4fa55dd avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875 am: e277181b71 am: 1a9f5250d8 am: 4bf710727b by Robert Shih · 9 years ago