tree d15477c3fe38ad3296a9e9f6a6c0926a3adcee16
parent 24fafc4cf51248024bcf297aca42f1d48650eaa4
parent 52706c6cc0d8ded20cfa8d46f200ca38f1009468
author Romain Guy <romainguy@google.com> 1365542770 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365542770 -0700

am 52706c6c: am 4a745e78: Merge "Change the dither texture\'s swizzling" into jb-mr2-dev

* commit '52706c6cc0d8ded20cfa8d46f200ca38f1009468':
  Change the dither texture's swizzling