tree 12f7c88e18840b79808600eb3a70b662fa5ef2a9
parent bec0e4959b85ef518a5cbdac272a566572f0f5fc
parent 3791d0112ef38c95b8de8b73c5a1f5b074e6e6e9
author John Hoford <hoford@google.com> 1435705158 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435705158 +0000

am 3791d011: am 6463dd52: Merge "add comment about xor not being porter/duff Bug: 21934855"

* commit '3791d0112ef38c95b8de8b73c5a1f5b074e6e6e9':
  add comment about xor not being porter/duff Bug: 21934855