diff options
| author | Paul Crowley <paulcrowley@google.com> | 2014-11-25 21:18:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 21:18:30 +0000 |
| commit | ba94fd5e6c243c6256a1627a41aaab52a74747d6 (patch) | |
| tree | 602329b561fa149ffa8a0e107c69fb27b5387a5b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 476520f744a950fc27d6ac466c301a909d92481a (diff) | |
| parent | 77e25331ca7ad1fb69fbe7fbec69179824e46e59 (diff) | |
am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev
* commit '77e25331ca7ad1fb69fbe7fbec69179824e46e59':
Add flag for wiping factory reset protection data.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
