tree 829ced194e3fcee75d49198d451dd1abb59469cc
parent f43b0e09dc6e0d4eb66f6d0e44372ed285a7a2b1
parent 4e9d9b2a590105035c29f12ecf0689333e6b55e7
author Chris Craik <ccraik@google.com> 1434133011 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1434133013 +0000

Merge "Revert to save-layer based alpha if layer would be too large" into mnc-dev