tree 1010d24db4a12c780043372860f28aae69540082
parent 76308437d2944128887cfffcda49c5b65a139f7f
parent 39890f555c7d8424505ad1c39d5ecfd8a0a894d7
author Christopher Ferris <cferris@google.com> 1491340886 +0000
committer android-build-merger <android-build-merger@google.com> 1491340886 +0000

Merge "Add kryo support." am: 07807a10a2 am: 7c510b9d43
am: 39890f555c

Change-Id: I305a485200075ecd5f0a9f3e3f0dd872c8b589fa