| commit | 45ae4eb8a23b48e2ea4bbc744a1283b00355eb2b | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Dec 24 12:04:50 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 24 12:04:50 2015 +0000 |
| tree | d0b511aa375695db13844853d49a91d893442d0e | |
| parent | 45407b471ef831fc10e79fc1f9ea5a6c8d838387 [diff] | |
| parent | 8b9589216dd8c2a644dab9623952b5fd8a32e550 [diff] |
Merge changes from topic \'aosp-merge-24-12\' am: 8b9589216d * commit '8b9589216dd8c2a644dab9623952b5fd8a32e550': 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.