tree d671891f3ebde24a5151e9c9b596b01a4cbf9e1c
parent 49d3c36134f818e06dc6c71d462ee8369c73c195
parent 71ba12308e338595d8068ff788bb5c8abfcfe515
author Deepanshu Gupta <deepanshu@google.com> 1426121592 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426121592 +0000

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

* commit '71ba12308e338595d8068ff788bb5c8abfcfe515':
  Fix cyclic dependency in BlendComposite and BlendingMode.