| commit | b50e3d9d138cf56d24726b3f7ed6aa14207d9cf5 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Fri May 10 14:17:23 2013 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri May 10 14:17:23 2013 +0000 |
| tree | bbfc812f29694f2859ef43bb07bf9be5f0918f06 | |
| parent | dd7513f905b207a62c092645de1c241dc3589fc7 [diff] | |
| parent | 95b0038a7fa3c8db83b024dcf7a915b488e44f28 [diff] |
Merge changes I34de4baf,Ie2b4593d,I4b84a9e1,I664b55d3,I60381a25 * changes: Manually merge JniConstants changes from 81fd7cc0. Add Calendar, Object, Object[] to well-known list Add InputStream and OutputStream to the well-known classes. Fix build. JniConstants is in libnativehelper, not libcore, in dalvik-dev. Moving libnativehelper additions from libcore