tree ecc47d37e493e4b3684ac39017134c2143289416
parent c706a980e426ea0e0b6aaee5530516b1a16c3755
parent 78660423900fa255cc83b85320e98d5184be393b
author Deepanshu Gupta <deepanshu@google.com> 1426120725 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426120725 +0000

am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev

* commit '78660423900fa255cc83b85320e98d5184be393b':
  Fix cyclic dependency in BlendComposite and BlendingMode.