diff options
| author | Alan Viverette <alanv@google.com> | 2015-06-05 17:27:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-05 17:27:18 +0000 |
| commit | 9896efc7922a2610f5734786df14f482b6c48eef (patch) | |
| tree | 32621f69658a6b424cc3c235b23e9b398933b9f5 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d4357ffd92a1b8de5e8cdfa2d8665214a0419c98 (diff) | |
| parent | 42cc892be135ed5be6f98f5f70bb6739bfaecaad (diff) | |
am 42cc892b: Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev
* commit '42cc892be135ed5be6f98f5f70bb6739bfaecaad':
Account for margins in ScrollView onMeasure() when filling viewport
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions