diff options
| author | Alan Viverette <alanv@google.com> | 2015-07-29 20:26:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 20:26:33 +0000 |
| commit | 5466d7548e32afecfda10aaeee05b89cdc3950e2 (patch) | |
| tree | 218a14dfb66472068b7a03e2ad2b9440311065b3 /rs/java/android/renderscript/Script.java | |
| parent | 7fedf5d4690fdb84283ac91703ee7aee34ab9049 (diff) | |
| parent | 4c06870db615acbf50008e0bc964e15a1c36aa22 (diff) | |
am 4c06870d: am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev
* commit '4c06870db615acbf50008e0bc964e15a1c36aa22':
Ensure maxHeight is at least 0 during measureChildHorizontal()
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions