diff options
| author | Jim Miller <jaggies@google.com> | 2015-08-19 01:43:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-19 01:43:02 +0000 |
| commit | 8978d9acbaaa89be3c14ed758e7c8a8d06071779 (patch) | |
| tree | a0bc57565d3c45966d8bf1a280024f310ef364c5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6041a68babcc0ec9cc2009fcfe75848882661785 (diff) | |
| parent | 309fef16e1494c80a54cbd0a59a98f32c512f845 (diff) | |
am 309fef16: am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev
* commit '309fef16e1494c80a54cbd0a59a98f32c512f845':
Revert "Disable fingerprint when remotely reset by DPM"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions