| commit | 3bfa9e2e8e518f057672566c5dfbca29a9594a8c | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Tue Sep 15 21:29:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 21:29:44 2015 +0000 |
| tree | 4a10f036cb6e6d735736634f36c9b4c291ed9284 | |
| parent | 1277aea8405ea3256a2b0f730506c4610cadafa4 [diff] | |
| parent | 498ddf8fba0cb13c8ddabbc08a080a8c9b42d25b [diff] |
am 498ddf8f: am 0f97cc30: resolved conflicts for 27f09f91 to stage-aosp-master * commit '498ddf8fba0cb13c8ddabbc08a080a8c9b42d25b': Enable signed-intger-overflow in colorconversion.