summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-06-13 08:25:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-13 08:25:36 -0700
commit33709d7f43dee89b703dbbddfaa79ec574f03e01 (patch)
treeb5ff4b5d0a08ee0a88a5e3d549a33dee58d345ca /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
parent1623b8cf7fed691b4752c5760bd5891dc3b11fd0 (diff)
parent026cba6c66677b6eb8ad6ac260dfd1bece07362d (diff)
am 026cba6c: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '026cba6c66677b6eb8ad6ac260dfd1bece07362d': Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter" Fix logspam when battery sysfs file not available.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions