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