| commit | 5e3937e672b5dbf4d4135c161ac944b7bf68fa00 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Thu Aug 21 17:30:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 21 17:30:38 2014 +0000 |
| tree | 191c1bb731c33d7d8073e7c191ae9ceac1d251b2 | |
| parent | 60166506e92f426fef9e525e4b343c3b3276e546 [diff] | |
| parent | b67c3fa484f0dd122c56f8d352cc405d4324707b [diff] |
am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" * commit '16aad88f8a12afef0eea31709c8bc67f7c8bbdab':