resolve merge conflicts of 8dc7b42 to mnc-dr-dev am: 5e17a2046b am: 58bfcb1dc5

am: bdf7425935

Change-Id: Ib187daca5301800209fb4ac2d0754799f33a815e
This commit is contained in:
Mark Salyzyn 2017-05-11 16:16:01 +00:00 • committed by android-build-merger
commit c7c53a53c2

View file

@ -464,7 +464,6 @@ typedef enum {
*/
#define INTRA_PRED_CHROMA_IDX_NONE 7
#define MAX_NUM_CLOCK_TS 3
#define MAX_USERDATA_PAYLOAD 256