diff options
| author | Nicolas Prevot <nprevot@google.com> | 2014-11-19 10:01:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 10:01:51 +0000 |
| commit | 9b07760dbcc19f47b9ee02081b26a9bbc2a40157 (patch) | |
| tree | 880732c0407940f411705603f1ac7c72e28c287d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ea3219ffa9a6b23f6a2bbcbbe6f6ca83490eadad (diff) | |
| parent | 439f17e622b3aaca2003eeeee2bb423abe6777a9 (diff) | |
am 439f17e6: am 76ea69b3: Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev
* commit '439f17e622b3aaca2003eeeee2bb423abe6777a9':
Fix javadoc in UserManager mentioning application restrictions.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions