1. 9c59bc9 resolve merge conflicts of 5c4fbd2817 to oc-mr1-dev-plus-aosp by Chih-Hung Hsieh · 8 years ago
  2. 5c4fbd2 Merge "Use -Werror in frameworks/av/media/libaaudio" am: 2a18bd96f6 by Chih-hung Hsieh · 8 years ago
  3. 2a18bd9 Merge "Use -Werror in frameworks/av/media/libaaudio" by Chih-hung Hsieh · 8 years ago
  4. abf85fc Use -Werror in frameworks/av/media/libaaudio by Chih-Hung Hsieh · 8 years ago
  5. 6faf7f3 Merge "Revert "Block allocateBackup if the node is not secure node."" into lmp-dev am: 323f6f51a6 am: c5e5b382fe am: 9dcb25476e am: f603689c7e am: 3b0cd870a1 am: 5b6cba8c2e -s ours am: bedc4af45e am: 2f8f50198d am: 9521a42842 am: 4c7a2e2667 am: df5ad2fecf am: 20086d7001 am: 146d96fe24 by Dongwon Kang · 8 years ago
  6. 2856539 Merge "Revert "Block allocateBackup if the node is not secure node."" into lmp-dev am: 323f6f51a6 am: c5e5b382fe am: 9dcb25476e am: f603689c7e am: 3b0cd870a1 am: 5b6cba8c2e -s ours am: bedc4af45e am: 2f8f50198d am: 9521a42842 am: 4c7a2e2667 am: df5ad2fecf am: 20086d7001 by Dongwon Kang · 8 years ago
  7. 146d96f Merge "Revert "Block allocateBackup if the node is not secure node."" into lmp-dev am: 323f6f51a6 am: c5e5b382fe am: 9dcb25476e am: f603689c7e am: 3b0cd870a1 am: 5b6cba8c2e -s ours am: bedc4af45e am: 2f8f50198d am: 9521a42842 am: 4c7a2e2667 am: df5ad2fecf by Dongwon Kang · 8 years ago
  8. 20086d7 Merge "Revert "Block allocateBackup if the node is not secure node."" into lmp-dev am: 323f6f51a6 am: c5e5b382fe am: 9dcb25476e am: f603689c7e am: 3b0cd870a1 am: 5b6cba8c2e -s ours am: bedc4af45e am: 2f8f50198d am: 9521a42842 am: 4c7a2e2667 by Dongwon Kang · 8 years ago
  9. df5ad2f Merge "Revert "Block allocateBackup if the node is not secure node."" into lmp-dev am: 323f6f51a6 am: c5e5b382fe am: 9dcb25476e am: f603689c7e am: 3b0cd870a1 am: 5b6cba8c2e -s ours am: bedc4af45e am: 2f8f50198d am: 9521a42842 by Dongwon Kang · 8 years ago
  10. 4c7a2e2 Merge "Revert "Block allocateBackup if the node is not secure node."" into lmp-dev am: 323f6f51a6 am: c5e5b382fe am: 9dcb25476e am: f603689c7e am: 3b0cd870a1 am: 5b6cba8c2e -s ours am: bedc4af45e am: 2f8f50198d by Dongwon Kang · 8 years ago
  11. 9521a42 Merge "Revert "Block allocateBackup if the node is not secure node."" into lmp-dev am: 323f6f51a6 am: c5e5b382fe am: 9dcb25476e am: f603689c7e am: 3b0cd870a1 am: 5b6cba8c2e -s ours am: bedc4af45e by Dongwon Kang · 8 years ago
  12. 2f8f501 Merge "Revert "Block allocateBackup if the node is not secure node."" into lmp-dev am: 323f6f51a6 am: c5e5b382fe am: 9dcb25476e am: f603689c7e am: 3b0cd870a1 am: 5b6cba8c2e -s ours by Dongwon Kang · 8 years ago
  13. bedc4af Merge "Revert "Block allocateBackup if the node is not secure node."" into lmp-dev am: 323f6f51a6 am: c5e5b382fe am: 9dcb25476e am: f603689c7e am: 3b0cd870a1 by Dongwon Kang · 8 years ago
  14. 5b6cba8 Merge "Revert "Block allocateBackup if the node is not secure node."" into lmp-dev am: 323f6f51a6 am: c5e5b382fe am: 9dcb25476e am: f603689c7e by Dongwon Kang · 8 years ago
  15. 3b0cd87 Merge "Revert "Block allocateBackup if the node is not secure node."" into lmp-dev am: 323f6f51a6 am: c5e5b382fe am: 9dcb25476e by Dongwon Kang · 8 years ago
  16. f603689 Merge "Revert "Block allocateBackup if the node is not secure node."" into lmp-dev am: 323f6f51a6 am: c5e5b382fe by Dongwon Kang · 8 years ago
  17. 9dcb254 Merge "Revert "Block allocateBackup if the node is not secure node."" into lmp-dev am: 323f6f51a6 by Dongwon Kang · 8 years ago
  18. c5e5b38 Merge "Revert "Block allocateBackup if the node is not secure node."" into lmp-dev by Dongwon Kang · 8 years ago
  19. 323f6f5 Merge "Revert "Block allocateBackup if the node is not secure node."" into lmp-dev by Dongwon Kang · 8 years ago
  20. 45cdbd0 Merge "Camera NDK: fix bug in lock order" into oc-mr1-dev am: 3624a0b582 by Yin-Chia Yeh · 8 years ago
  21. 3624a0b Merge "Camera NDK: fix bug in lock order" into oc-mr1-dev by TreeHugger Robot · 8 years ago
  22. a10ab5b Camera NDK: fix bug in lock order by Yin-Chia Yeh · 8 years ago
  23. 51d2cca stagefright: MP4Extractor: allow 10% overhead on default sample size am: a27317ab45 am: 268c480035 am: 87ce4202df am: d8c0785a36 am: fed97f38c2 am: 44f4c4d388 am: bdba8a6e12 am: de67feb70e am: 4723392015 am: c071a00dcf am: 7555e69a7e am: 181e39beba am: d8ec820e75 by Lajos Molnar · 8 years ago
  24. a509637 stagefright: MP4Extractor: allow 10% overhead on default sample size am: a27317ab45 am: 268c480035 am: 87ce4202df am: d8c0785a36 am: fed97f38c2 am: 44f4c4d388 am: bdba8a6e12 am: de67feb70e am: 4723392015 am: c071a00dcf am: 7555e69a7e am: 181e39beba by Lajos Molnar · 8 years ago
  25. d8ec820 stagefright: MP4Extractor: allow 10% overhead on default sample size am: a27317ab45 am: 268c480035 am: 87ce4202df am: d8c0785a36 am: fed97f38c2 am: 44f4c4d388 am: bdba8a6e12 am: de67feb70e am: 4723392015 am: c071a00dcf am: 7555e69a7e by Lajos Molnar · 8 years ago
  26. 181e39b stagefright: MP4Extractor: allow 10% overhead on default sample size am: a27317ab45 am: 268c480035 am: 87ce4202df am: d8c0785a36 am: fed97f38c2 am: 44f4c4d388 am: bdba8a6e12 am: de67feb70e am: 4723392015 am: c071a00dcf by Lajos Molnar · 8 years ago
  27. 7555e69 stagefright: MP4Extractor: allow 10% overhead on default sample size am: a27317ab45 am: 268c480035 am: 87ce4202df am: d8c0785a36 am: fed97f38c2 am: 44f4c4d388 am: bdba8a6e12 am: de67feb70e am: 4723392015 by Lajos Molnar · 8 years ago
  28. c071a00 stagefright: MP4Extractor: allow 10% overhead on default sample size am: a27317ab45 am: 268c480035 am: 87ce4202df am: d8c0785a36 am: fed97f38c2 am: 44f4c4d388 am: bdba8a6e12 am: de67feb70e by Lajos Molnar · 8 years ago
  29. 4723392 stagefright: MP4Extractor: allow 10% overhead on default sample size am: a27317ab45 am: 268c480035 am: 87ce4202df am: d8c0785a36 am: fed97f38c2 am: 44f4c4d388 am: bdba8a6e12 by Lajos Molnar · 8 years ago
  30. de67feb stagefright: MP4Extractor: allow 10% overhead on default sample size am: a27317ab45 am: 268c480035 am: 87ce4202df am: d8c0785a36 am: fed97f38c2 am: 44f4c4d388 by Lajos Molnar · 8 years ago
  31. bdba8a6 stagefright: MP4Extractor: allow 10% overhead on default sample size am: a27317ab45 am: 268c480035 am: 87ce4202df am: d8c0785a36 am: fed97f38c2 by Lajos Molnar · 8 years ago
  32. 44f4c4d stagefright: MP4Extractor: allow 10% overhead on default sample size am: a27317ab45 am: 268c480035 am: 87ce4202df am: d8c0785a36 by Lajos Molnar · 8 years ago
  33. fed97f3 stagefright: MP4Extractor: allow 10% overhead on default sample size am: a27317ab45 am: 268c480035 am: 87ce4202df by Lajos Molnar · 8 years ago
  34. d8c0785 stagefright: MP4Extractor: allow 10% overhead on default sample size am: a27317ab45 am: 268c480035 by Lajos Molnar · 8 years ago
  35. 87ce420 stagefright: MP4Extractor: allow 10% overhead on default sample size am: a27317ab45 by Lajos Molnar · 8 years ago
  36. 268c480 stagefright: MP4Extractor: allow 10% overhead on default sample size by Lajos Molnar · 8 years ago
  37. a8ed92b Merge "Camera NDK: fix typedef name" am: c4defa724e am: 3b318a6b73 by Yin-Chia Yeh · 8 years ago
  38. 3b318a6 Merge "Camera NDK: fix typedef name" am: c4defa724e by Yin-Chia Yeh · 8 years ago
  39. c4defa7 Merge "Camera NDK: fix typedef name" by Treehugger Robot · 8 years ago
  40. 33835a1 Merge "cas: validate shared buffer size before using -- DO NOT MERGE" into oc-dev am: 9dcd300f22 am: a71eb1246d -s ours by Chong Zhang · 8 years ago
  41. be4552a Merge "cas: validate shared buffer size before using -- DO NOT MERGE" into oc-dev am: 9dcd300f22 by Chong Zhang · 8 years ago
  42. a71eb12 Merge "cas: validate shared buffer size before using -- DO NOT MERGE" into oc-dev by Chong Zhang · 8 years ago
  43. 9dcd300 Merge "cas: validate shared buffer size before using -- DO NOT MERGE" into oc-dev by Chong Zhang · 8 years ago
  44. 0211980 cas: validate shared buffer size before using -- DO NOT MERGE by Chong Zhang · 8 years ago
  45. 9ca6858 Merge "Use -Werror in frameworks/av/services/minijail" am: a09c0d25ea by Chih-hung Hsieh · 8 years ago
  46. 60aa845 Merge "Use -Werror in frameworks/av/services/minijail" am: a09c0d25ea by Chih-hung Hsieh · 8 years ago
  47. a09c0d2 Merge "Use -Werror in frameworks/av/services/minijail" by Chih-hung Hsieh · 8 years ago
  48. 4e17cad Merge "Access AVCDEC context after create fail check" into mnc-dr-dev am: eba5ad1a07 am: ba9840c1ce am: 6fd437edf7 am: b334ac03d9 am: a61eab4354 am: 193030ccf0 am: 407b19779b am: 7fc9b2250c am: af7531a478 am: 92fefbd90b by Naveen Kumar P · 8 years ago
  49. f6c6cc0 Merge "Access AVCDEC context after create fail check" into mnc-dr-dev am: eba5ad1a07 am: ba9840c1ce am: 6fd437edf7 am: b334ac03d9 am: a61eab4354 am: 193030ccf0 am: 407b19779b am: 7fc9b2250c am: af7531a478 by Naveen Kumar P · 8 years ago
  50. 92fefbd Merge "Access AVCDEC context after create fail check" into mnc-dr-dev am: eba5ad1a07 am: ba9840c1ce am: 6fd437edf7 am: b334ac03d9 am: a61eab4354 am: 193030ccf0 am: 407b19779b am: 7fc9b2250c by Naveen Kumar P · 8 years ago
  51. af7531a Merge "Access AVCDEC context after create fail check" into mnc-dr-dev am: eba5ad1a07 am: ba9840c1ce am: 6fd437edf7 am: b334ac03d9 am: a61eab4354 am: 193030ccf0 am: 407b19779b by Naveen Kumar P · 8 years ago
  52. 7fc9b22 Merge "Access AVCDEC context after create fail check" into mnc-dr-dev am: eba5ad1a07 am: ba9840c1ce am: 6fd437edf7 am: b334ac03d9 am: a61eab4354 am: 193030ccf0 by Naveen Kumar P · 8 years ago
  53. 407b197 Merge "Access AVCDEC context after create fail check" into mnc-dr-dev am: eba5ad1a07 am: ba9840c1ce am: 6fd437edf7 am: b334ac03d9 am: a61eab4354 by Naveen Kumar P · 8 years ago
  54. 193030c Merge "Access AVCDEC context after create fail check" into mnc-dr-dev am: eba5ad1a07 am: ba9840c1ce am: 6fd437edf7 am: b334ac03d9 by Naveen Kumar P · 8 years ago
  55. a61eab4 Merge "Access AVCDEC context after create fail check" into mnc-dr-dev am: eba5ad1a07 am: ba9840c1ce am: 6fd437edf7 by Naveen Kumar P · 8 years ago
  56. 6918a85 Merge "avoid 32-bit integer overflow" into oc-dev am: 88b32e4b7f am: f6b45069bb by Ray Essick · 8 years ago
  57. b334ac0 Merge "Access AVCDEC context after create fail check" into mnc-dr-dev am: eba5ad1a07 am: ba9840c1ce by Naveen Kumar P · 8 years ago
  58. b3399c1 Merge "avoid 32-bit integer overflow" into oc-dev am: 88b32e4b7f am: f6b45069bb by Ray Essick · 8 years ago
  59. 6fd437e Merge "Access AVCDEC context after create fail check" into mnc-dr-dev am: eba5ad1a07 by Naveen Kumar P · 8 years ago
  60. f6b4506 Merge "avoid 32-bit integer overflow" into oc-dev am: 88b32e4b7f by Ray Essick · 8 years ago
  61. ba9840c Merge "Access AVCDEC context after create fail check" into mnc-dr-dev by Naveen Kumar P · 8 years ago
  62. 88b32e4 Merge "avoid 32-bit integer overflow" into oc-dev by TreeHugger Robot · 8 years ago
  63. eba5ad1 Merge "Access AVCDEC context after create fail check" into mnc-dr-dev by TreeHugger Robot · 8 years ago
  64. 7bfd89a Merge "Access HEVC context after create fail check" into mnc-dr-dev am: 87b588d93d am: 549c01e1a9 am: a115c2224f am: 1b708c3280 am: 2b78e32614 am: ce1c38267a am: eb84c70440 am: 0edc44c4a7 am: 0dae933096 am: 71a6f197ce by Naveen Kumar P · 8 years ago
  65. c35f909 Merge "Access HEVC context after create fail check" into mnc-dr-dev am: 87b588d93d am: 549c01e1a9 am: a115c2224f am: 1b708c3280 am: 2b78e32614 am: ce1c38267a am: eb84c70440 am: 0edc44c4a7 am: 0dae933096 by Naveen Kumar P · 8 years ago
  66. 71a6f19 Merge "Access HEVC context after create fail check" into mnc-dr-dev am: 87b588d93d am: 549c01e1a9 am: a115c2224f am: 1b708c3280 am: 2b78e32614 am: ce1c38267a am: eb84c70440 am: 0edc44c4a7 by Naveen Kumar P · 8 years ago
  67. 0dae933 Merge "Access HEVC context after create fail check" into mnc-dr-dev am: 87b588d93d am: 549c01e1a9 am: a115c2224f am: 1b708c3280 am: 2b78e32614 am: ce1c38267a am: eb84c70440 by Naveen Kumar P · 8 years ago
  68. 0edc44c Merge "Access HEVC context after create fail check" into mnc-dr-dev am: 87b588d93d am: 549c01e1a9 am: a115c2224f am: 1b708c3280 am: 2b78e32614 am: ce1c38267a by Naveen Kumar P · 8 years ago
  69. 683c79b Use -Werror in frameworks/av/services/minijail by Chih-Hung Hsieh · 8 years ago
  70. eb84c70 Merge "Access HEVC context after create fail check" into mnc-dr-dev am: 87b588d93d am: 549c01e1a9 am: a115c2224f am: 1b708c3280 am: 2b78e32614 by Naveen Kumar P · 8 years ago
  71. ce1c382 Merge "Access HEVC context after create fail check" into mnc-dr-dev am: 87b588d93d am: 549c01e1a9 am: a115c2224f am: 1b708c3280 by Naveen Kumar P · 8 years ago
  72. 2b78e32 Merge "Access HEVC context after create fail check" into mnc-dr-dev am: 87b588d93d am: 549c01e1a9 am: a115c2224f by Naveen Kumar P · 8 years ago
  73. 1b708c3 Merge "Access HEVC context after create fail check" into mnc-dr-dev am: 87b588d93d am: 549c01e1a9 by Naveen Kumar P · 8 years ago
  74. a115c22 Merge "Access HEVC context after create fail check" into mnc-dr-dev am: 87b588d93d by Naveen Kumar P · 8 years ago
  75. 549c01e Merge "Access HEVC context after create fail check" into mnc-dr-dev by Naveen Kumar P · 8 years ago
  76. 87b588d Merge "Access HEVC context after create fail check" into mnc-dr-dev by TreeHugger Robot · 8 years ago
  77. 6392485 Merge "aaudio: fix loss of sync with HW FIFO index" into oc-mr1-dev by Phil Burk · 8 years ago
  78. 1a55036 Merge "aaudio: fix loss of sync with HW FIFO index" into oc-mr1-dev by TreeHugger Robot · 8 years ago
  79. 999e110 aaudio: fix loss of sync with HW FIFO index by Phil Burk · 8 years ago
  80. ba0a69a Merge "Perform database moveObject after actual move." am: 8aa2c307cb by Jerry Zhang · 8 years ago
  81. 29447aa Merge "Perform database moveObject after actual move." am: 8aa2c307cb by Jerry Zhang · 8 years ago
  82. 8aa2c30 Merge "Perform database moveObject after actual move." by Treehugger Robot · 8 years ago
  83. 527fbe1 Merge "Fix the UAF bug caused by a dead stack variable" into nyc-dev am: b8097855d3 am: e676c5e0b5 am: c153373bab am: c355787c4c am: 4b452debee am: f5472207b1 am: 60ac960bec by Pawin Vongmasa · 8 years ago
  84. 45bdc82 Merge "Fix the UAF bug caused by a dead stack variable" into nyc-dev am: b8097855d3 am: e676c5e0b5 am: c153373bab am: c355787c4c am: 4b452debee am: f5472207b1 by Pawin Vongmasa · 8 years ago
  85. 60ac960 Merge "Fix the UAF bug caused by a dead stack variable" into nyc-dev am: b8097855d3 am: e676c5e0b5 am: c153373bab am: c355787c4c am: 4b452debee by Pawin Vongmasa · 8 years ago
  86. f547220 Merge "Fix the UAF bug caused by a dead stack variable" into nyc-dev am: b8097855d3 am: e676c5e0b5 am: c153373bab am: c355787c4c by Pawin Vongmasa · 8 years ago
  87. 4b452de Merge "Fix the UAF bug caused by a dead stack variable" into nyc-dev am: b8097855d3 am: e676c5e0b5 am: c153373bab by Pawin Vongmasa · 8 years ago
  88. c355787 Merge "Fix the UAF bug caused by a dead stack variable" into nyc-dev am: b8097855d3 am: e676c5e0b5 by Pawin Vongmasa · 8 years ago
  89. c153373 Merge "Fix the UAF bug caused by a dead stack variable" into nyc-dev am: b8097855d3 by Pawin Vongmasa · 8 years ago
  90. e676c5e Merge "Fix the UAF bug caused by a dead stack variable" into nyc-dev by Pawin Vongmasa · 8 years ago
  91. b809785 Merge "Fix the UAF bug caused by a dead stack variable" into nyc-dev by TreeHugger Robot · 8 years ago
  92. 8e6a6fe Access AVCDEC context after create fail check by Naveen Kumar P · 8 years ago
  93. 09b8330 Merge "SoftAVCDec: Handle zero length input without EOS" into mnc-dev am: 8aea8688a9 am: 338b4d8874 am: 625aafde01 am: 29acf1fb4b am: d2732c9a66 am: c97a38392c am: 8434933a6b am: 11aca02242 am: 005c331866 am: 352648debd am: 2adf132c95 by Harish Mahendrakar · 8 years ago
  94. ed7477e Merge "SoftAVCDec: Handle zero length input without EOS" into mnc-dev am: 8aea8688a9 am: 338b4d8874 am: 625aafde01 am: 29acf1fb4b am: d2732c9a66 am: c97a38392c am: 8434933a6b am: 11aca02242 am: 005c331866 am: 352648debd by Harish Mahendrakar · 8 years ago
  95. 2adf132 Merge "SoftAVCDec: Handle zero length input without EOS" into mnc-dev am: 8aea8688a9 am: 338b4d8874 am: 625aafde01 am: 29acf1fb4b am: d2732c9a66 am: c97a38392c am: 8434933a6b am: 11aca02242 am: 005c331866 by Harish Mahendrakar · 8 years ago
  96. 352648d Merge "SoftAVCDec: Handle zero length input without EOS" into mnc-dev am: 8aea8688a9 am: 338b4d8874 am: 625aafde01 am: 29acf1fb4b am: d2732c9a66 am: c97a38392c am: 8434933a6b am: 11aca02242 by Harish Mahendrakar · 8 years ago
  97. 005c331 Merge "SoftAVCDec: Handle zero length input without EOS" into mnc-dev am: 8aea8688a9 am: 338b4d8874 am: 625aafde01 am: 29acf1fb4b am: d2732c9a66 am: c97a38392c am: 8434933a6b by Harish Mahendrakar · 8 years ago
  98. 11aca02 Merge "SoftAVCDec: Handle zero length input without EOS" into mnc-dev am: 8aea8688a9 am: 338b4d8874 am: 625aafde01 am: 29acf1fb4b am: d2732c9a66 am: c97a38392c by Harish Mahendrakar · 8 years ago
  99. 8434933 Merge "SoftAVCDec: Handle zero length input without EOS" into mnc-dev am: 8aea8688a9 am: 338b4d8874 am: 625aafde01 am: 29acf1fb4b am: d2732c9a66 by Harish Mahendrakar · 8 years ago
  100. c97a383 Merge "SoftAVCDec: Handle zero length input without EOS" into mnc-dev am: 8aea8688a9 am: 338b4d8874 am: 625aafde01 am: 29acf1fb4b by Harish Mahendrakar · 8 years ago