diff options
| author | Paul Crowley <paulcrowley@google.com> | 2014-11-26 12:02:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 12:02:37 +0000 |
| commit | 0d122e265c52ef25dbad652378b3a5e51a86f041 (patch) | |
| tree | 6d3360fdbadf6037acaa8c12baddab7497387d69 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 65940c4ceb43e81aa720a29a9bb84818bdaabcbc (diff) | |
| parent | ba94fd5e6c243c6256a1627a41aaab52a74747d6 (diff) | |
am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev
* commit 'ba94fd5e6c243c6256a1627a41aaab52a74747d6':
Add flag for wiping factory reset protection data.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions