diff options
| author | Christopher Tate <ctate@google.com> | 2013-05-07 10:01:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-07 10:01:09 -0700 |
| commit | ec28e4b5887becfaa65e90a895ac913f88f9c54b (patch) | |
| tree | df5c4f8df8ac6049f1ee319b59571eb27b33a58e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 977b2531ae7d4e4d09f85e1261647d844d0eb99c (diff) | |
| parent | 5f714213546d667ac241a92e2052b30dabef8355 (diff) | |
am 5f714213: am e242c731: Merge "Ensure install-during-restore is like install-then-restore" into jb-mr2-dev
* commit '5f714213546d667ac241a92e2052b30dabef8355':
Ensure install-during-restore is like install-then-restore
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions