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