diff options
| author | Narayan Kamath <narayan@google.com> | 2015-12-24 11:56:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-24 11:56:44 +0000 |
| commit | e0e81bf407508ec096c752948f8794af5fd480ca (patch) | |
| tree | 554a9c68ce1b4f1ef0d2a32c9ef3fa035081e32a /rs/java/android/renderscript/RenderScript.java | |
| parent | 76a9e55a8fd751e747511a9c7d02dddca31964c3 (diff) | |
| parent | a87723515627401f142aec1fd98b8863b726a1a3 (diff) | |
Merge changes from topic 'aosp-merge-24-12'
* changes:
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 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions