diff options
| author | Sander Alewijnse <salewijnse@google.com> | 2014-11-07 22:35:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-07 22:35:51 +0000 |
| commit | 1b0dbd5c954b61e2ee95f87817a1ec0e7d242b20 (patch) | |
| tree | b381c21242087bf96b0b0f52f3f6c731e3b7e689 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e37c761e5e850aebb3be56a2eadaa85cc2134547 (diff) | |
| parent | 8c1cd7e61f050afd450cb05add633e2fbe0b195a (diff) | |
am 8c1cd7e6: am 3eed90f3: Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev
* commit '8c1cd7e61f050afd450cb05add633e2fbe0b195a':
Added the restrictions pending application restrictions key.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions