diff options
| author | Alan Viverette <alanv@google.com> | 2014-12-02 23:19:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 23:19:28 +0000 |
| commit | 0cd6296c0afb92f63487247ef4c9c73715113926 (patch) | |
| tree | 15d5cc629f36afca6a9e6c3d07228ec57ee8a74e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 24d40b302e5dabc6c435b6549ef5801540edfca8 (diff) | |
| parent | 63c7a655beab21da934d21bb4004889bfb6e4417 (diff) | |
am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev
* commit '63c7a655beab21da934d21bb4004889bfb6e4417':
Deprecate Resources.getDrawable(int) in favor of the two-arg version
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions