| commit | 498ddf8fba0cb13c8ddabbc08a080a8c9b42d25b | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Tue Sep 15 21:19:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 21:19:09 2015 +0000 |
| tree | 7086639ea22209e02d558bc0482c3ebde312b1ff | |
| parent | 9f64931c68a7594653fff5c8dd8055fa15e385c9 [diff] | |
| parent | 0f97cc30663d3a4f636463124c04763c509eab40 [diff] |
am 0f97cc30: resolved conflicts for 27f09f91 to stage-aosp-master * commit '0f97cc30663d3a4f636463124c04763c509eab40': Enable signed-intger-overflow in colorconversion.