diff options
| author | Narayan Kamath <narayan@google.com> | 2015-12-24 04:31:00 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-24 04:31:00 -0800 |
| commit | f4ea850c515c1f675f9203c5f88b6995b8539c16 (patch) | |
| tree | 801d4842e32ec97a658815d146484c8fad48ce4f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c800ff99cc1ec6c813d4f40050aae72bcff08eb1 (diff) | |
| parent | f59c02a65e9fd529467c4e5083d94ed6453e70f7 (diff) | |
Merge changes from topic \'aosp-merge-24-12\' am: e0e81bf407
am: f59c02a65e -s ours
* commit 'f59c02a65e9fd529467c4e5083d94ed6453e70f7':
Special case system_server to not create the JIT code cache.
Don't use IntegralToString
Track libcore commit 85d69e16fe1e59e50c1ad228e754abf325088362.
Track API changes to java.lang.ref.Reference.
Remove merge markers from preloaded-classes
Move StrictJarFile from libcore to framework
Switch RecoverySystem impl to use sun.security.pkcs
API update for OpenJdk based libcore
Use libcore/known_oj_tags for the javadoc stage.
Stop preloading fortress classes
Use HexDump instead of java.lang.IntegralToString
Add core-oj to the list of core library jars.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions