diff options
author | Makoto Onuki <omakoto@google.com> | 2017-06-26 23:31:59 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-26 23:31:59 +0000 |
commit | eb63919bc4a4c8673b34114b7b61e40181f6c07a (patch) | |
tree | 47ef4079e2123d632858361a2667dd56940fedc1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 231e291b06a734d7ee0bc620ef992b9bd591c3fe (diff) | |
parent | 9f607f4c0bf91dcfdd5dd7d9cce920471833fd30 (diff) |
Merge "Fix activity icon badging for non-bitmap icons" into oc-dev
am: 9f607f4c0b
Change-Id: Ie8b426c14fa30b7c2f5eadc5818e1dfd16f8c0a5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions