tree c293799efb62b4ad5fb39723ead2b5e9a4e4a218
parent a8b8fe91ee2781805eb310b8775162a6d4de4e31
parent 6463dd52470a2279e699647a282a085c00604d0c
author John Hoford <hoford@google.com> 1435704296 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435704296 +0000

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

* commit '6463dd52470a2279e699647a282a085c00604d0c':
  add comment about xor not being porter/duff Bug: 21934855