| commit | 1fe89b7b72ff2469d8398426638ca594d2b42ef7 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Mon Jul 21 10:53:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 21 10:53:06 2014 +0000 |
| tree | dec300d800ab609d116150953fe9a63bd65611ed | |
| parent | 2b55660319da1aa8167a301d0d6a9f71d117f05a [diff] | |
| parent | e0c6824f32c7f1fd230267316e61b849fda7189d [diff] |
am e0c6824f: resolved conflicts for merge of 47f0ec56 to jb-dev-plus-aosp * commit 'e0c6824f32c7f1fd230267316e61b849fda7189d': Add additional checks in ObjectInputStream