| commit | 082a8542d722ca2f0551ed1f58592df0ebd811dd | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Fri Mar 20 23:15:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:15:00 2015 +0000 |
| tree | 298bf379e2d05489ab6d5907221d22778bb1e885 | |
| parent | db862aa6d31101e41b859dcc41fb360053f2beef [diff] | |
| parent | 985244abea85772c5fa4cae5012af903ca59a30a [diff] |
am 985244ab: am dc946875: am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" * commit '985244abea85772c5fa4cae5012af903ca59a30a':