| commit | f65ee55561e2a5f53be6db2ce03e518e249c9e80 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Wed May 07 14:37:31 2014 -0700 |
| committer | Wink Saville <wink@google.com> | Wed May 07 14:37:31 2014 -0700 |
| tree | ebec75f7ede9150939c836d1695e8a9b08bc30ef | |
| parent | d89b3060b40d8485d02e48d11056750495ecb577 [diff] | |
| parent | e887563af628efea8f49b1393d30c33107b198e0 [diff] |
Merge commit 'e887563a' into fix-merge-conclict * commit 'e887563a': Revert "am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"" Change-Id: I1222ae20e6caef67c5a00ac481e10fe7b7d2a91c