diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-13 01:18:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 01:18:13 +0000 |
| commit | 1dd2f5a3ebd4768ebc8bf4c08c7f62c8c1300c7f (patch) | |
| tree | fbb004882998e67f07d301bf55895a67f14ff2a7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ea30eb29f87618de673e8b069b1a545749edf076 (diff) | |
| parent | 40bc20660d3dc65f66e4409893f1ba6bf729d97f (diff) | |
am 40bc2066: am a54d4583: am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev
* commit '40bc20660d3dc65f66e4409893f1ba6bf729d97f':
Fix issue #23116383: Include security patch level in Settings
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions