1. 4d67911 resolve merge conflicts of 1ab38dc to nyc-dev-plus-aosp am: a81ef2c548 by Wonsik Kim · 9 years ago
  2. 6983564 DO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded am: 450fd950d0 am: a7a43eb646 -s ours am: 63f8141861 am: 761a18edbe am: a577e1c6ee am: 3148acf4a8 -s ours am: c8b94e7b83 am: 785d9bf0b2 by Wonsik Kim · 9 years ago
  3. 8117307 Merge "DO NOT MERGE - stagefright: fix integer overflow error" into nyc-dev am: 500412d788 am: aad4991f4b by Wonsik Kim · 9 years ago
  4. 7030d12 DO NOT MERGE - stagefright: fix integer overflow error am: 1ab38dcf9b am: 65cb362eb2 by Wonsik Kim · 9 years ago
  5. fdf0437 resolve merge conflicts of 396a570 to nyc-mr1-dev-plus-aosp by Pawin Vongmasa · 9 years ago
  6. a81ef2c resolve merge conflicts of 1ab38dc to nyc-dev-plus-aosp by Pawin Vongmasa · 9 years ago
  7. bfbf214 Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev am: ee58cd8522 am: a28d14862a am: f3cfa7f815 -s ours am: 7ab70a7ba9 am: 7543b66cfd am: bfceea2523 am: 13b7fceb5a -s ours am: 58218e1ffa by Wonsik Kim · 9 years ago
  8. 8e3a746 DO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded am: 450fd950d0 am: a7a43eb646 -s ours am: 63f8141861 am: 761a18edbe am: a577e1c6ee am: 3148acf4a8 -s ours am: c8b94e7b83 by Wonsik Kim · 9 years ago
  9. 7ccacce Merge "DO NOT MERGE - stagefright: fix integer overflow error" into nyc-dev am: 500412d788 by Pawin Vongmasa · 9 years ago
  10. 396a570 DO NOT MERGE - stagefright: fix integer overflow error am: 1ab38dcf9b by Wonsik Kim · 9 years ago
  11. 2da394d Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev am: ee58cd8522 am: a28d14862a am: f3cfa7f815 -s ours am: 7ab70a7ba9 am: 7543b66cfd am: bfceea2523 am: 13b7fceb5a -s ours by Wonsik Kim · 9 years ago
  12. 785d9bf DO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded am: 450fd950d0 am: a7a43eb646 -s ours am: 63f8141861 am: 761a18edbe am: a577e1c6ee am: 3148acf4a8 -s ours by Wonsik Kim · 9 years ago
  13. 0fbdf7a Merge "audioflinger: fix OutputTrack initial check" into nyc-mr1-dev am: 190bca156e by Eric Laurent · 9 years ago
  14. aad4991 Merge "DO NOT MERGE - stagefright: fix integer overflow error" into nyc-dev by Wonsik Kim · 9 years ago
  15. 65cb362 DO NOT MERGE - stagefright: fix integer overflow error am: 1ab38dcf9b by Wonsik Kim · 9 years ago
  16. 54efaa9 audioflinger: fix OutputTrack initial check am: af3ec7c9a0 am: 5271857554 by Eric Laurent · 9 years ago
  17. 2fef1de Merge "audioflinger: fix OutputTrack initial check" into nyc-mr1-dev by Eric Laurent · 9 years ago
  18. 5271857 audioflinger: fix OutputTrack initial check am: af3ec7c9a0 by Eric Laurent · 9 years ago
  19. 58218e1 Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev am: ee58cd8522 am: a28d14862a am: f3cfa7f815 -s ours am: 7ab70a7ba9 am: 7543b66cfd am: bfceea2523 by Wonsik Kim · 9 years ago
  20. c8b94e7 DO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded am: 450fd950d0 am: a7a43eb646 -s ours am: 63f8141861 am: 761a18edbe am: a577e1c6ee by Wonsik Kim · 9 years ago
  21. 500412d Merge "DO NOT MERGE - stagefright: fix integer overflow error" into nyc-dev by Pawin Vongmasa · 9 years ago
  22. 13b7fce Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev am: ee58cd8522 am: a28d14862a am: f3cfa7f815 -s ours am: 7ab70a7ba9 am: 7543b66cfd by Wonsik Kim · 9 years ago
  23. 3148acf DO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded am: 450fd950d0 am: a7a43eb646 -s ours am: 63f8141861 am: 761a18edbe by Wonsik Kim · 9 years ago
  24. 190bca1 Merge "audioflinger: fix OutputTrack initial check" into nyc-mr1-dev by Eric Laurent · 9 years ago
  25. bfceea2 Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev am: ee58cd8522 am: a28d14862a am: f3cfa7f815 -s ours am: 7ab70a7ba9 by Wonsik Kim · 9 years ago
  26. a577e1c DO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded am: 450fd950d0 am: a7a43eb646 -s ours am: 63f8141861 by Wonsik Kim · 9 years ago
  27. 7543b66 Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev am: ee58cd8522 am: a28d14862a am: f3cfa7f815 -s ours by Wonsik Kim · 9 years ago
  28. 761a18e DO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded am: 450fd950d0 am: a7a43eb646 -s ours by Wonsik Kim · 9 years ago
  29. 7ab70a7 Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev am: ee58cd8522 am: a28d14862a by Wonsik Kim · 9 years ago
  30. 63f8141 DO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded am: 450fd950d0 by Wonsik Kim · 9 years ago
  31. f3cfa7f Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev am: ee58cd8522 by Wonsik Kim · 9 years ago
  32. a7a43eb DO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded by Wonsik Kim · 9 years ago
  33. a28d148 Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev by Wonsik Kim · 9 years ago
  34. 450fd95 DO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded by Wonsik Kim · 9 years ago
  35. ee58cd8 Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev by TreeHugger Robot · 9 years ago
  36. d3c73b7 Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1a7de0 -s ours am: 64c06e051a am: bbc4b190d0 am: 559b777d4f -s ours am: 1d39eeea17 am: 3f5bbfce01 am: 94ec2dd388 am: 2e7021aeae -s ours am: 53424fe60e am: 18056e4013 by Wonsik Kim · 9 years ago
  37. 223e84b DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours am: 4efaa1bca7 am: ac9dd1421d am: 4f4d793ecb -s ours am: b017233d05 am: 26cf54f35a am: b278cb0afd am: fbab974cd3 -s ours am: 9f3de40494 am: f5a56591c0 by Wonsik Kim · 9 years ago
  38. 79f73cb Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1a7de0 -s ours am: 64c06e051a am: bbc4b190d0 am: 559b777d4f -s ours am: 1d39eeea17 am: 3f5bbfce01 am: 94ec2dd388 am: 2e7021aeae -s ours am: 53424fe60e by Marco Nelissen · 9 years ago
  39. f32c701 Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1a7de0 -s ours am: 64c06e051a am: bbc4b190d0 am: 559b777d4f -s ours am: 1d39eeea17 am: 3f5bbfce01 am: 94ec2dd388 am: 2e7021aeae -s ours am: 53424fe60e by Marco Nelissen · 9 years ago
  40. 75fc3c4 DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours am: 4efaa1bca7 am: ac9dd1421d am: 4f4d793ecb -s ours am: b017233d05 am: 26cf54f35a am: b278cb0afd am: fbab974cd3 -s ours am: 9f3de40494 by Wonsik Kim · 9 years ago
  41. bd81775 DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours am: 4efaa1bca7 am: ac9dd1421d am: 4f4d793ecb -s ours am: b017233d05 am: 26cf54f35a am: b278cb0afd am: fbab974cd3 -s ours am: 9f3de40494 by Wonsik Kim · 9 years ago
  42. 1ab38dc DO NOT MERGE - stagefright: fix integer overflow error by Wonsik Kim · 9 years ago
  43. 040aaee Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1a7de0 -s ours am: 64c06e051a am: bbc4b190d0 am: 559b777d4f -s ours am: 1d39eeea17 am: 3f5bbfce01 am: 94ec2dd388 am: 2e7021aeae -s ours by Wonsik Kim · 9 years ago
  44. b8f760e DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours am: 4efaa1bca7 am: ac9dd1421d am: 4f4d793ecb -s ours am: b017233d05 am: 26cf54f35a am: b278cb0afd am: fbab974cd3 -s ours by Wonsik Kim · 9 years ago
  45. 18056e4 Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1a7de0 -s ours am: 64c06e051a am: bbc4b190d0 am: 559b777d4f -s ours am: 1d39eeea17 am: 3f5bbfce01 am: 94ec2dd388 am: 2e7021aeae -s ours by Wonsik Kim · 9 years ago
  46. f5a5659 DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours am: 4efaa1bca7 am: ac9dd1421d am: 4f4d793ecb -s ours am: b017233d05 am: 26cf54f35a am: b278cb0afd am: fbab974cd3 -s ours by Wonsik Kim · 9 years ago
  47. 53424fe Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1a7de0 -s ours am: 64c06e051a am: bbc4b190d0 am: 559b777d4f -s ours am: 1d39eeea17 am: 3f5bbfce01 am: 94ec2dd388 by Marco Nelissen · 9 years ago
  48. 9f3de40 DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours am: 4efaa1bca7 am: ac9dd1421d am: 4f4d793ecb -s ours am: b017233d05 am: 26cf54f35a am: b278cb0afd by Wonsik Kim · 9 years ago
  49. 2e7021a Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1a7de0 -s ours am: 64c06e051a am: bbc4b190d0 am: 559b777d4f -s ours am: 1d39eeea17 am: 3f5bbfce01 by Wonsik Kim · 9 years ago
  50. fbab974 DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours am: 4efaa1bca7 am: ac9dd1421d am: 4f4d793ecb -s ours am: b017233d05 am: 26cf54f35a by Wonsik Kim · 9 years ago
  51. 94ec2dd Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1a7de0 -s ours am: 64c06e051a am: bbc4b190d0 am: 559b777d4f -s ours am: 1d39eeea17 by Marco Nelissen · 9 years ago
  52. b278cb0 DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours am: 4efaa1bca7 am: ac9dd1421d am: 4f4d793ecb -s ours am: b017233d05 by Wonsik Kim · 9 years ago
  53. 3f5bbfc Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1a7de0 -s ours am: 64c06e051a am: bbc4b190d0 am: 559b777d4f -s ours by Wonsik Kim · 9 years ago
  54. 26cf54f DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours am: 4efaa1bca7 am: ac9dd1421d am: 4f4d793ecb -s ours by Wonsik Kim · 9 years ago
  55. 1d39eee Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1a7de0 -s ours am: 64c06e051a am: bbc4b190d0 by Marco Nelissen · 9 years ago
  56. b017233 DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours am: 4efaa1bca7 am: ac9dd1421d by Wonsik Kim · 9 years ago
  57. 559b777 Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1a7de0 -s ours am: 64c06e051a by Wonsik Kim · 9 years ago
  58. 4f4d793 DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours am: 4efaa1bca7 by Wonsik Kim · 9 years ago
  59. 2d58796 DO NOT MERGE - stagefright: fix integer overflow error by Wonsik Kim · 9 years ago
  60. bbc4b19 Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am: 8f4b1a7de0 -s ours by Marco Nelissen · 9 years ago
  61. ac9dd14 DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours by Wonsik Kim · 9 years ago
  62. 64c06e0 Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev by Wonsik Kim · 9 years ago
  63. 4efaa1b DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31 -s ours by Wonsik Kim · 9 years ago
  64. 8f4b1a7 Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev by Marco Nelissen · 9 years ago
  65. 1d43623 DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours am: 87d4805d94 -s ours am: 3041de70c5 am: 0c51e9905d am: f3da79cfea -s ours am: a47d63df6f am: b88ce695e4 am: c9919f953a am: 3aa706059b -s ours am: 09170c0ec5 am: 82a7b77967 by Wonsik Kim · 9 years ago
  66. a1eae21 DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours am: 87d4805d94 -s ours am: 3041de70c5 am: 0c51e9905d am: f3da79cfea -s ours am: a47d63df6f am: b88ce695e4 am: c9919f953a am: 3aa706059b -s ours am: 09170c0ec5 by Wonsik Kim · 9 years ago
  67. 76b2924 DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours am: 87d4805d94 -s ours am: 3041de70c5 am: 0c51e9905d am: f3da79cfea -s ours am: a47d63df6f am: b88ce695e4 am: c9919f953a am: 3aa706059b -s ours am: 09170c0ec5 by Wonsik Kim · 9 years ago
  68. 12e43b9 DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours am: 87d4805d94 -s ours am: 3041de70c5 am: 0c51e9905d am: f3da79cfea -s ours am: a47d63df6f am: b88ce695e4 am: c9919f953a am: 3aa706059b -s ours by Wonsik Kim · 9 years ago
  69. 82a7b77 DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours am: 87d4805d94 -s ours am: 3041de70c5 am: 0c51e9905d am: f3da79cfea -s ours am: a47d63df6f am: b88ce695e4 am: c9919f953a am: 3aa706059b -s ours by Wonsik Kim · 9 years ago
  70. 09170c0 DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours am: 87d4805d94 -s ours am: 3041de70c5 am: 0c51e9905d am: f3da79cfea -s ours am: a47d63df6f am: b88ce695e4 am: c9919f953a by Wonsik Kim · 9 years ago
  71. 3aa7060 DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours am: 87d4805d94 -s ours am: 3041de70c5 am: 0c51e9905d am: f3da79cfea -s ours am: a47d63df6f am: b88ce695e4 by Wonsik Kim · 9 years ago
  72. c9919f9 DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours am: 87d4805d94 -s ours am: 3041de70c5 am: 0c51e9905d am: f3da79cfea -s ours am: a47d63df6f by Wonsik Kim · 9 years ago
  73. b88ce69 DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours am: 87d4805d94 -s ours am: 3041de70c5 am: 0c51e9905d am: f3da79cfea -s ours by Wonsik Kim · 9 years ago
  74. a47d63d DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours am: 87d4805d94 -s ours am: 3041de70c5 am: 0c51e9905d by Wonsik Kim · 9 years ago
  75. f3da79c DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours am: 87d4805d94 -s ours am: 3041de70c5 by Wonsik Kim · 9 years ago
  76. a94028a DO NOT MERGE - stagefright: fix integer overflow error am: 52780d3ce3 am: b39e9bffc1 am: 21d9f05d94 am: 483a7e47ac -s ours am: 449277dde0 am: 301e841f86 by Wonsik Kim · 9 years ago
  77. 502d3d8 DO NOT MERGE - stagefright: fix integer overflow error am: 52780d3ce3 am: b39e9bffc1 am: 21d9f05d94 am: 483a7e47ac -s ours am: 449277dde0 by Wonsik Kim · 9 years ago
  78. 087fc8f DO NOT MERGE - stagefright: fix integer overflow error am: 52780d3ce3 am: b39e9bffc1 am: 21d9f05d94 am: 483a7e47ac -s ours am: 449277dde0 by Wonsik Kim · 9 years ago
  79. 21f70af DO NOT MERGE - stagefright: fix integer overflow error am: 52780d3ce3 am: b39e9bffc1 am: 21d9f05d94 am: 483a7e47ac -s ours by Wonsik Kim · 9 years ago
  80. 0c51e990 DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours am: 87d4805d94 -s ours by Wonsik Kim · 9 years ago
  81. 301e841 DO NOT MERGE - stagefright: fix integer overflow error am: 52780d3ce3 am: b39e9bffc1 am: 21d9f05d94 am: 483a7e47ac -s ours by Wonsik Kim · 9 years ago
  82. 449277d DO NOT MERGE - stagefright: fix integer overflow error am: 52780d3ce3 am: b39e9bffc1 am: 21d9f05d94 by Wonsik Kim · 9 years ago
  83. 3041de7 DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a -s ours by Wonsik Kim · 9 years ago
  84. 87d4805 DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 by Wonsik Kim · 9 years ago
  85. 483a7e4 DO NOT MERGE - stagefright: fix integer overflow error am: 52780d3ce3 am: b39e9bffc1 by Wonsik Kim · 9 years ago
  86. 21d9f05 DO NOT MERGE - stagefright: fix integer overflow error am: 52780d3ce3 by Wonsik Kim · 9 years ago
  87. e40e452 DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 by Wonsik Kim · 9 years ago
  88. b39e9bf DO NOT MERGE - stagefright: fix integer overflow error am: 52780d3ce3 by Wonsik Kim · 9 years ago
  89. 8df5df7 DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 by Wonsik Kim · 9 years ago
  90. af3ec7c audioflinger: fix OutputTrack initial check by Eric Laurent · 9 years ago
  91. 2731403 Merge \\"Handle lock() returning a NULL buffer in SurfaceUtils.\\" into nyc-mr1-dev am: 3e5605b8b8 by Craig Donner · 9 years ago
  92. 70a5f42 Handle lock() returning a NULL buffer in SurfaceUtils. am: afeffa81d0 by Craig Donner · 9 years ago
  93. df16efe Merge \"Handle lock() returning a NULL buffer in SurfaceUtils.\" into nyc-mr1-dev by Craig Donner · 9 years ago
  94. a52e6dd Handle lock() returning a NULL buffer in SurfaceUtils. am: afeffa81d0 by Craig Donner · 9 years ago
  95. f4f36a0 DO NOT MERGE - stagefright: fix integer overflow error by Wonsik Kim · 9 years ago
  96. 52780d3 DO NOT MERGE - stagefright: fix integer overflow error by Wonsik Kim · 9 years ago
  97. 17a10c5 DO NOT MERGE - stagefright: fix integer overflow error by Wonsik Kim · 9 years ago
  98. 3e5605b Merge "Handle lock() returning a NULL buffer in SurfaceUtils." into nyc-mr1-dev by Craig Donner · 9 years ago
  99. 4d61c67 Merge \\"AudioFlinger: Prevent offload underrun during active playback\\" into nyc-mr1-dev am: f929f9b203 by Andy Hung · 9 years ago
  100. 648bc95 Merge \\"AudioFlinger: Account for frames dropped in suspend mode\\" into nyc-mr1-dev am: f769ab76d1 by Andy Hung · 9 years ago