| commit | 5cf6a25ac8c3c7dc5c3f598578659e1c3d697838 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Wed Aug 20 20:58:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 20 20:58:25 2014 +0000 |
| tree | b93446b5558b9540b70a62d2f7e78d5110b996c6 | |
| parent | 681a96ff0ebe924dcf9c8d07a800b9e2fb6cccb4 [diff] | |
| parent | 33a80f248a31f7d15227794d97d26d9e71746a3c [diff] |
am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '232698c44c5d0fec83030adcc4c2048964f2dc66':