diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-13 01:09:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 01:09:15 +0000 |
| commit | 40bc20660d3dc65f66e4409893f1ba6bf729d97f (patch) | |
| tree | dd20b72903fbd59379fe7b0f2b14ce46ad08190f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b4ac37818efa6ea81902f8b2631260b5b1b0ce78 (diff) | |
| parent | a54d4583ec4d6b112a99c29ef71fbabfd67478cb (diff) | |
am a54d4583: am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev
* commit 'a54d4583ec4d6b112a99c29ef71fbabfd67478cb':
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