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

am 447f664a: Merge changes I9fecff3c,I2c1eb07f 

* commit '447f664aef6694bb9fb3db85d6166d908cde8a8d':
  Fix repeated packed field merging code for non-packed data.
  Add validation when parsing enum fields.
parents 14ae5639 a2d72a58
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