Commit cddcfeaa authored by Max Cai's avatar Max Cai Committed by Android Git Automerger
Browse files

am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f 

* commit '5d33d23ded77a145f59a915f19044aa14335d93b':
  Fix repeated packed field merging code for non-packed data.
  Add validation when parsing enum fields.
parents 7a830998 6d7dfd31
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment