diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2016-07-21 18:13:31 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2016-07-21 18:13:31 -0700 |
| commit | 05160d70d14180fef3782a63dff2e822b51c3cf5 (patch) | |
| tree | 4f8f6504761b71975a9c7a3790aef427f275fc8a /libs/hwui/Matrix.h | |
| parent | 95e42d97f4b5150db2dcf1c26b3b50e6e133d1e4 (diff) | |
| parent | 5152fd909cf3bb9c7d27f0379f3dc1db619d2b8a (diff) | |
resolve merge conflicts of 5152fd9 to stage-aosp-master
Change-Id: I2066125eb4076dbc9e8996bb1fa87735aa6040d3
Diffstat (limited to 'libs/hwui/Matrix.h')
| -rw-r--r-- | libs/hwui/Matrix.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/Matrix.h b/libs/hwui/Matrix.h index 9cde5d6aa04e..ba9cbbe02ec1 100644 --- a/libs/hwui/Matrix.h +++ b/libs/hwui/Matrix.h @@ -81,11 +81,11 @@ public: loadIdentity(); } - Matrix4(const float* v) { + explicit Matrix4(const float* v) { load(v); } - Matrix4(const SkMatrix& v) { + Matrix4(const SkMatrix& v) { // NOLINT, implicit load(v); } |