tree c025b997ea186254da0b011f8b8203e58d78674a
parent dfccaccaa1087b1c59eb4a817bce6948fcb8357b
parent 9c458148e9c113ee7092f05ede90a71a64a01adb
author Chris Craik <ccraik@google.com> 1438286360 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438286360 +0000

am 9c458148: am 3d208671: am 7dfb1d99: am 730c0f65: Merge "Fix stencil mask usage in HWUI" into mnc-dev

* commit '9c458148e9c113ee7092f05ede90a71a64a01adb':
  Fix stencil mask usage in HWUI