tree 7086639ea22209e02d558bc0482c3ebde312b1ff
parent 9f64931c68a7594653fff5c8dd8055fa15e385c9
parent 0f97cc30663d3a4f636463124c04763c509eab40
author Dan Austin <danielaustin@google.com> 1442351949 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442351949 +0000

am 0f97cc30: resolved conflicts for 27f09f91 to stage-aosp-master

* commit '0f97cc30663d3a4f636463124c04763c509eab40':
  Enable signed-intger-overflow in colorconversion.