diff options
author | Bill Yi <byi@google.com> | 2014-10-22 09:00:49 -0700 |
---|---|---|
committer | Bill Yi <byi@google.com> | 2014-10-22 09:00:49 -0700 |
commit | 5a71f83227f0340a265f34b226d8fe01d4dd9773 (patch) | |
tree | 9e74435ad8e21fe6ace6a1c49ca2f596c60ced34 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 52656916e35b08013bf776b3603d6cecba287a1e (diff) | |
parent | a0d07d49b8b0aae71beb48ec31b43f6923530d00 (diff) |
Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master
Change-Id: I7063b7b52e9c09a57eb6bf3b4ffa3716d58ebf43
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
-rw-r--r-- | rs/java/android/renderscript/ProgramFragmentFixedFunction.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/rs/java/android/renderscript/ProgramFragmentFixedFunction.java b/rs/java/android/renderscript/ProgramFragmentFixedFunction.java index 2fe68be703a5..2b647c7668ff 100644 --- a/rs/java/android/renderscript/ProgramFragmentFixedFunction.java +++ b/rs/java/android/renderscript/ProgramFragmentFixedFunction.java @@ -17,9 +17,6 @@ package android.renderscript; -import android.util.Log; - - /** * @hide * @deprecated in API 16 |