| commit | 29520883030dd2b58820eedf720d4287e63282bc | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Thu Aug 21 02:47:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 21 02:47:42 2014 +0000 |
| tree | dbb8abe3f82dcd8e5419983ff33160ce85dfa03f | |
| parent | 6cb2f95c5b5b937d8bafee87908bd00e1894a440 [diff] | |
| parent | 5cf6a25ac8c3c7dc5c3f598578659e1c3d697838 [diff] |
am 89f0407f: am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" * commit '89f0407f57f9127ab8d1040a06af741173faece2':