| Index: gyp/common_conditions.gypi
 | 
| diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
 | 
| index 92fb819f08e37c74b30e06a7de8941032b8edd17..3743b60d3c089750fb6aaeba330da3f364199109 100644
 | 
| --- a/gyp/common_conditions.gypi
 | 
| +++ b/gyp/common_conditions.gypi
 | 
| @@ -301,8 +301,9 @@
 | 
|          # Temporary until https:#googleplex-android-review.git.corp.google.com/#/c/442220/
 | 
|          # lands.
 | 
|          'SK_SUPPORT_LEGACY_GETTOTALCLIP',
 | 
| -        # Still need to switch Android to the new name for N32.
 | 
| -        'kNative_8888_SkColorType kN32_SkColorType',
 | 
| +        # Use a better name for kPMColor_SkColorType until
 | 
| +        # https://code.google.com/p/skia/issues/detail?id=2384 is fixed.
 | 
| +        'kNative_8888_SkColorType kPMColor_SkColorType',
 | 
|        ],
 | 
|      }],
 | 
|  
 | 
| 
 |