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