1. 840e2dc Merge "Raise MTP max burst values." am: b95db7560e by Jerry Zhang · 9 years ago
  2. b95db75 Merge "Raise MTP max burst values." by Jerry Zhang · 9 years ago
  3. 2a14168 Raise MTP max burst values. by Jerry Zhang · 9 years ago
  4. 7ac1f99 Merge "fix warning: Dereference of null pointer" am: a2e67eb95e by Yunlian Jiang · 9 years ago
  5. a2e67eb Merge "fix warning: Dereference of null pointer" by Treehugger Robot · 9 years ago
  6. fa4baa3 Merge "fix warning: struct argument contains uninitialized data" am: 4ad8990c14 by Yunlian Jiang · 9 years ago
  7. 4ad8990 Merge "fix warning: struct argument contains uninitialized data" by Treehugger Robot · 9 years ago
  8. ad17ddb Merge "fix uninitialized warning." am: 2008d8857c by Yunlian Jiang · 9 years ago
  9. 2008d88 Merge "fix uninitialized warning." by Treehugger Robot · 9 years ago
  10. 746f8ac fix uninitialized warning. by Yunlian Jiang · 9 years ago
  11. 8ddc352 fix warning: struct argument contains uninitialized data by Yunlian Jiang · 9 years ago
  12. bed2c85 Merge "NuPlayerSource: clarify getFormat API and fix its usage." am: aeaa5f825c by Wei Jia · 9 years ago
  13. aeaa5f8 Merge "NuPlayerSource: clarify getFormat API and fix its usage." by Treehugger Robot · 9 years ago
  14. 8bc3496 NuPlayerSource: clarify getFormat API and fix its usage. by Wei Jia · 9 years ago
  15. df2298a Merge "DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed -s ours am: 437d60bffb am: 028e36fe32 am: 5b83000768 am: e45718e94a am: a9cfe53698" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  16. c6ca74d DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed -s ours am: 437d60bffb am: 028e36fe32 am: 5b83000768 am: e45718e94a by Wonsik Kim · 9 years ago
  17. b2205a8 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed -s ours am: 437d60bffb am: 028e36fe32 am: 5b83000768 am: e45718e94a by Wonsik Kim · 9 years ago
  18. a9cfe53 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed -s ours am: 437d60bffb am: 028e36fe32 am: 5b83000768 by Wonsik Kim · 9 years ago
  19. ba2f1aa DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed -s ours am: 437d60bffb am: 028e36fe32 am: 5b83000768 by Wonsik Kim · 9 years ago
  20. e45718e DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed -s ours am: 437d60bffb am: 028e36fe32 by Wonsik Kim · 9 years ago
  21. 5b83000 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed -s ours am: 437d60bffb by Wonsik Kim · 9 years ago
  22. 9014209 Merge "codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610 am: e80b15a63f am: c5343a578c am: 9224cc83f7 am: b67b0afbf5" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  23. 7fa2b10 codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610 am: e80b15a63f am: c5343a578c am: 9224cc83f7 by Wonsik Kim · 9 years ago
  24. e38187f codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610 am: e80b15a63f am: c5343a578c am: 9224cc83f7 by Wonsik Kim · 9 years ago
  25. a68afd7 codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610 am: e80b15a63f am: c5343a578c by Wonsik Kim · 9 years ago
  26. 028e36f DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 am: 3b57c387ed -s ours by Wonsik Kim · 9 years ago
  27. b67b0af codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610 am: e80b15a63f am: c5343a578c by Wonsik Kim · 9 years ago
  28. 437d60b DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 am: dbeeaf29d0 by Wonsik Kim · 9 years ago
  29. 9224cc8 codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610 am: e80b15a63f by Wonsik Kim · 9 years ago
  30. c5343a5 codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 am: 2430ff6610 by Wonsik Kim · 9 years ago
  31. 3b57c38 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 am: 1dfa590543 by Wonsik Kim · 9 years ago
  32. e80b15a codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e am: 58f7175ed4 by Wonsik Kim · 9 years ago
  33. dbeeaf2 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours am: 292dc7e025 by Wonsik Kim · 9 years ago
  34. 2430ff6 codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 am: 83485b615e by Wonsik Kim · 9 years ago
  35. 1dfa590 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc am: 55d8132edd -s ours by Wonsik Kim · 9 years ago
  36. 292dc7e DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours am: 1760d73fbc by Wonsik Kim · 9 years ago
  37. 58f7175 codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 am: 787a5136f0 by Wonsik Kim · 9 years ago
  38. 83485b6 codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 am: a5e72ec799 by Wonsik Kim · 9 years ago
  39. 55d8132 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours am: da9246fa5e -s ours by Wonsik Kim · 9 years ago
  40. 1760d73 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 am: daaabdcaac -s ours by Wonsik Kim · 9 years ago
  41. 787a513 codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 am: 4f428b7c02 by Wonsik Kim · 9 years ago
  42. a5e72ec codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 by Wonsik Kim · 9 years ago
  43. da9246f DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e am: afaa438503 by Wonsik Kim · 9 years ago
  44. 4f428b7 codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046 by Wonsik Kim · 9 years ago
  45. daaabdc DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e by Wonsik Kim · 9 years ago
  46. afaa438 DO NOT MERGE codecs: handle onReset() for a few encoders am: dd447c354e by Wonsik Kim · 9 years ago
  47. 89f501d codecs: handle onReset() for a few encoders am: 5443b57cc5 by Wonsik Kim · 9 years ago
  48. 5443b57 codecs: handle onReset() for a few encoders by Wonsik Kim · 9 years ago
  49. dd447c3 DO NOT MERGE codecs: handle onReset() for a few encoders by Wonsik Kim · 9 years ago
  50. 2138547 Merge "EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 am: 8e86da478b am: 7ea7597648 am: 5c9fcda34e am: 1703e10721" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  51. 3bb00b5 EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 am: 8e86da478b am: 7ea7597648 am: 5c9fcda34e by Jean-Michel Trivi · 9 years ago
  52. dbedfa0 EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 am: 8e86da478b am: 7ea7597648 am: 5c9fcda34e by Jean-Michel Trivi · 9 years ago
  53. 8987fbb EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 am: 8e86da478b am: 7ea7597648 by Jean-Michel Trivi · 9 years ago
  54. 1703e10 EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 am: 8e86da478b am: 7ea7597648 by Jean-Michel Trivi · 9 years ago
  55. 5c9fcda EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 am: 8e86da478b by Jean-Michel Trivi · 9 years ago
  56. 7ea7597 EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 am: 654e9f9282 by Jean-Michel Trivi · 9 years ago
  57. 8e86da4 EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 am: 9169ca1b88 by Jean-Michel Trivi · 9 years ago
  58. 654e9f9 EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 am: 3db88c0f00 by Jean-Michel Trivi · 9 years ago
  59. 9169ca1 EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b am: 3ffe48ed29 by Jean-Michel Trivi · 9 years ago
  60. 3db88c0 EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a am: e5c0e7e10b by Jean-Michel Trivi · 9 years ago
  61. 3ffe48e EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 am: b9e070af6a by Jean-Michel Trivi · 9 years ago
  62. e5c0e7e EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81 by Jean-Michel Trivi · 9 years ago
  63. b9e070a EffectBundle: check nb channels to write speaker angles am: e5a54485e0 by Jean-Michel Trivi · 9 years ago
  64. b0896df EffectBundle: check nb channels to write speaker angles am: e5a54485e0 by Jean-Michel Trivi · 9 years ago
  65. e5a5448 EffectBundle: check nb channels to write speaker angles by Jean-Michel Trivi · 9 years ago
  66. 0976c26 Merge "Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e am: 3b122332a1 am: 89cbb8482b am: 3ce7b4ddca am: 96fbe3c2e5 am: d625f8dcab am: d572632948 am: 72ff526520 am: 60a16aeb56" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  67. b6483a7 Merge "Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e am: 3b122332a1 am: 89cbb8482b am: 3ce7b4ddca am: 96fbe3c2e5 am: d625f8dcab am: d572632948 am: 72ff526520 am: 1d0255e990" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  68. d37728a Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e am: 3b122332a1 am: 89cbb8482b am: 3ce7b4ddca am: 96fbe3c2e5 am: d625f8dcab am: d572632948 am: 72ff526520 by Marco Nelissen · 9 years ago
  69. 1eb2e0f Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e am: 3b122332a1 am: 89cbb8482b am: 3ce7b4ddca am: 96fbe3c2e5 am: d625f8dcab am: d572632948 am: 72ff526520 by Marco Nelissen · 9 years ago
  70. 38a8a8e Merge "resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0 am: 199f36c95a am: fb800b98ed am: f70b522d31 am: 20d68e02bc am: d41141cc0f" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 9 years ago
  71. b5f3a88 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0 am: 199f36c95a am: fb800b98ed am: f70b522d31 am: 20d68e02bc by Marco Nelissen · 9 years ago
  72. 6c47ea8 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0 am: 199f36c95a am: fb800b98ed am: f70b522d31 am: 20d68e02bc by Marco Nelissen · 9 years ago
  73. 1d0255e Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e am: 3b122332a1 am: 89cbb8482b am: 3ce7b4ddca am: 96fbe3c2e5 am: d625f8dcab am: d572632948 by Marco Nelissen · 9 years ago
  74. 60a16ae Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e am: 3b122332a1 am: 89cbb8482b am: 3ce7b4ddca am: 96fbe3c2e5 am: d625f8dcab am: d572632948 by Marco Nelissen · 9 years ago
  75. bd8cc74 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 · 9 years ago
  76. 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 · 9 years ago
  77. 72ff526 Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e am: 3b122332a1 am: 89cbb8482b am: 3ce7b4ddca am: 96fbe3c2e5 am: d625f8dcab by Marco Nelissen · 9 years ago
  78. 20d68e0 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0 am: 199f36c95a am: fb800b98ed by Marco Nelissen · 9 years ago
  79. d572632 Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e am: 3b122332a1 am: 89cbb8482b am: 3ce7b4ddca am: 96fbe3c2e5 by Marco Nelissen · 9 years ago
  80. f70b522 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0 am: 199f36c95a by Marco Nelissen · 9 years ago
  81. d625f8d Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e am: 3b122332a1 am: 89cbb8482b am: 3ce7b4ddca by Marco Nelissen · 9 years ago
  82. fb800b9 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 am: c9d4267bf0 by Marco Nelissen · 9 years ago
  83. 96fbe3c Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e am: 3b122332a1 am: 89cbb8482b by Marco Nelissen · 9 years ago
  84. 199f36c resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 by Marco Nelissen · 9 years ago
  85. 3ce7b4d Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e am: 3b122332a1 by Marco Nelissen · 9 years ago
  86. c9d4267 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce by Marco Nelissen · 9 years ago
  87. 89cbb84 Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 am: 917033735e by Marco Nelissen · 9 years ago
  88. 24058e9 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce by Marco Nelissen · 9 years ago
  89. 3b12233 Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 am: 497f2ccce4 by Marco Nelissen · 9 years ago
  90. 86d5e96 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 by Marco Nelissen · 9 years ago
  91. 9170337 Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146 by Marco Nelissen · 9 years ago
  92. 50358a8 resolve merge conflicts of 79cf158c51 to mnc-dev by Marco Nelissen · 9 years ago
  93. 497f2cc Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b by Marco Nelissen · 9 years ago
  94. 79cf158 Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d am: 86bd734f58 am: 7902138f2e am: a23c9a47ab by Marco Nelissen · 9 years ago
  95. 3fc94bc Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca by Marco Nelissen · 9 years ago
  96. f8a2e81 Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d am: 86bd734f58 am: 7902138f2e by Marco Nelissen · 9 years ago
  97. ea20234 Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 by Marco Nelissen · 9 years ago
  98. a23c9a4 Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d am: 86bd734f58 by Marco Nelissen · 9 years ago
  99. 7f3980c Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce by Marco Nelissen · 9 years ago
  100. 7902138 Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d by Marco Nelissen · 9 years ago