| commit | 4d73cf3c34361e384c154ed8ae709a42aadbd9fe | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Mon Jul 21 11:03:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 21 11:03:07 2014 +0000 |
| tree | 54e1117a6057b0917d4c06a11bdd2d3a5e18a6a1 | |
| parent | 5c5adbdbd25f88190d83ad87a27596bb97f71551 [diff] | |
| parent | 81feaa00e69aec9d61268c4cbaaf37817b338e1c [diff] |
am 81feaa00: am 889e1d5a: am 1fe89b7b: am e0c6824f: resolved conflicts for merge of 47f0ec56 to jb-dev-plus-aosp * commit '81feaa00e69aec9d61268c4cbaaf37817b338e1c': Add additional checks in ObjectInputStream