Commit 2666d4df authored by Wink Saville's avatar Wink Saville
Browse files

Merge commit 'e887563a' into fix-merge-conclict 

* commit 'e887563a':
  Revert "am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize""

Change-Id: I1222ae20e6caef67c5a00ac481e10fe7b7d2a91c
parents 63bb1894 546ed9af
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