tree 7662b57fbd0ef4ea2b6fb64444ea27e78bae9522
parent 291f0484a489990b7d59a78b91792fa3d935eb5c
parent 13fb32b15d428e4633674b9bb8bb7d4750e7e909
author Wink Saville <wink@google.com> 1399503459 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399503459 +0000

am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""

* commit '13fb32b15d428e4633674b9bb8bb7d4750e7e909':