tree 99bf258f9dba95e239609bf9b36654def094eeee
parent fceec0e124a55b25d59f2af5279c70ac045d6771
parent 65215edd7acada70c2bcb060daec6ff718ae92ba
author Deepanshu Gupta <deepanshu@google.com> 1426122537 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426122537 +0000

am 65215edd: am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev

* commit '65215edd7acada70c2bcb060daec6ff718ae92ba':
  Fix cyclic dependency in BlendComposite and BlendingMode.