diff options
| author | Jim Miller <jaggies@google.com> | 2015-02-25 18:09:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-25 18:09:54 +0000 |
| commit | 19847b07e81b9b29e3574ce6ab8acf7a958a1a63 (patch) | |
| tree | 344b66a6eee49cd8310b86c42734ccdc9866b69a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bb463806aa9a83d10cfff5f565eebd71d500ae4e (diff) | |
| parent | b46e48067fd03b63fa5f5191651ac2a5d009e226 (diff) | |
am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit 'b46e48067fd03b63fa5f5191651ac2a5d009e226':
Remove TrustAgent whitelisting API
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions