diff options
| author | Alan Viverette <alanv@google.com> | 2014-12-03 00:31:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 00:31:13 +0000 |
| commit | 1eb35de5220cfe6f3e3d62fbe796b32d8e3a0607 (patch) | |
| tree | d864400751e1272acb32a4b1fa13ec378eea7e01 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 58d3ddae33892b2dc64ce8bb4d23264dc8de884a (diff) | |
| parent | 0cd6296c0afb92f63487247ef4c9c73715113926 (diff) | |
am 0cd6296c: am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev
* commit '0cd6296c0afb92f63487247ef4c9c73715113926':
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