| commit | a0ad80ae797b1336979b395a538c4de49ef03ba5 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Dec 24 04:11:55 2015 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 24 04:11:55 2015 -0800 |
| tree | 9498532513e005d98b3a0a6f3d617d5d14895743 | |
| parent | 98112f1f71aa17f3d2efb613fd86311e148f99c8 [diff] | |
| parent | 45ae4eb8a23b48e2ea4bbc744a1283b00355eb2b [diff] |
Merge changes from topic \'aosp-merge-24-12\' am: 8b9589216d am: 45ae4eb8a2 -s ours * commit '45ae4eb8a23b48e2ea4bbc744a1283b00355eb2b': 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.