| commit | d149dc6b2fe3bce5c7ad27ea0c4f369c01e7e001 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Tue May 13 10:24:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 10:24:50 2014 +0000 |
| tree | 4f4246b7f31ddf283aced10770059a444a2860dd | |
| parent | 877fc1579aef9a0cc0c430c5e5ad81087f659672 [diff] | |
| parent | ff582a5e591946d1eb5d4ce238bf170c86d5e731 [diff] |
am ff582a5e: am 424b079e: am c03fdbde: Merge "Fix ObjectInputStream proxy de-serialization" * commit 'ff582a5e591946d1eb5d4ce238bf170c86d5e731': Fix ObjectInputStream proxy de-serialization