diff options
| author | Winson Chung <winsonc@google.com> | 2015-08-01 16:35:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-01 16:35:42 +0000 |
| commit | afa039c96c2587095c588145fbbb2237be51f9bc (patch) | |
| tree | eeb389a8bf267cff01ba514e656f890783a81e20 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 92a59d8ea879970871392c5b2eb24810e7af9b51 (diff) | |
| parent | 183b589fd4e3381a5f64f2782f3fffad9dd25b0e (diff) | |
am 183b589f: am 92e0c86f: Merge "Ensuring that we don\'t try to use and propagate null activity labels." into mnc-dev
* commit '183b589fd4e3381a5f64f2782f3fffad9dd25b0e':
Ensuring that we don't try to use and propagate null activity labels.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions