diff options
| author | Benjamin Franz <bfranz@google.com> | 2016-07-21 15:39:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-21 15:39:58 +0000 |
| commit | 461309a63ab7881dfac07ca7e09318afad3039fc (patch) | |
| tree | 04b74776571b23975974367c19db69ab0a2d83cd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4f93fdb999eb025de43a962a82ee6a6eb8be0074 (diff) | |
| parent | 662e2a79753eebc39899d4a363096f1cae6c9b43 (diff) | |
Merge \\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 am: 87534f4ac9 am: cb805b35f3 -s ours
am: 662e2a7975
Change-Id: I453d98b170f1383ad41f5e73b8f0818240f4778d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions