diff options
author | Narayan Kamath <narayan@google.com> | 2015-12-24 04:07:42 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-12-24 04:07:42 -0800 |
commit | f59c02a65e9fd529467c4e5083d94ed6453e70f7 (patch) | |
tree | e9a5698ba44b2e3104a2747e7dc7125346ae61b3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 68521a682524c53e6bfd883a3f41b4fe514c2d0c (diff) | |
parent | e0e81bf407508ec096c752948f8794af5fd480ca (diff) |
Merge changes from topic \'aosp-merge-24-12\'
am: e0e81bf407
* commit 'e0e81bf407508ec096c752948f8794af5fd480ca':
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