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