diff options
| author | Elliott Hughes <enh@google.com> | 2015-08-12 22:31:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-12 22:31:01 +0000 |
| commit | 39669d7f6b8fedef3468ab3d417c93a21df528af (patch) | |
| tree | d5b97ca57f80a919eb55c3279703f1e254b25cca /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 14b884c16ecf3a70999fcbd1862f6f1b38b24367 (diff) | |
| parent | 6fdc633380bb4744595575449101ee171b690175 (diff) | |
am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base."
* commit '6fdc633380bb4744595575449101ee171b690175':
Lose HAVE_ANDROID_OS from frameworks/base.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions