| commit | 8b9589216dd8c2a644dab9623952b5fd8a32e550 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Dec 24 11:56:45 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Dec 24 11:56:45 2015 +0000 |
| tree | 4ba4b153d1162462b9b50334a8d09cce040044df | |
| parent | f9911ae087189c26e0ef8a2334233116a8944aa7 [diff] | |
| parent | 3006881f84c9abf1ab85b77ecd4e815c4cb880d0 [diff] |
Merge changes from topic 'aosp-merge-24-12' * changes: Temporary workaround to build bouncycastle / nist-pkits Build: Build changes for multi oat/image support. Allow modules to override the default NOTICE file. Track introduction of libopenjdkjvm. Allow for 5200 words in dump-words-to-file Update the package whitelist for the boot image. Use core-oj alongside core-libart wherever required.