diff options
| author | Alan Viverette <alanv@google.com> | 2015-01-05 21:50:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-05 21:50:18 +0000 |
| commit | 7768fd2f8e412f87300882bfa5f205944425fd0f (patch) | |
| tree | 62f0974986fa773305591f3c6bd325b3e7eeaaac /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | afeb044afc0d62f67bba7c4f2fd959627fef9f06 (diff) | |
| parent | 74882cb0e3810ab1d77bc85a9ed1fa2b024a0159 (diff) | |
am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev
automerge: 74882cb
* commit '74882cb0e3810ab1d77bc85a9ed1fa2b024a0159':
Don't override dialog icon drawable unless valid resource ID was set
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions