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

am: 5e07c7ab0c

Change-Id: I4af4911ce3b9d5334e29dca3125d24f933f7d4dd
This commit is contained in:
Mark Salyzyn 2017-05-11 16:20:32 +00:00 • committed by android-build-merger
commit 1cce360bf3

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