diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2016-07-21 19:14:36 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2016-07-21 19:14:36 -0700 |
| commit | f53bfc911fa88c15b25f38553a5647ad00f221a3 (patch) | |
| tree | 78c8438100aad9012251dcfd6ea50d2785e5423d /libs/hwui/Rect.h | |
| parent | 1f38231b7fca008766fdc135b90172fd2b983315 (diff) | |
| parent | 3fb651b0b73c462d96df063e19cc3cfefa249262 (diff) | |
resolve merge conflicts of 3fb651b to nyc-mr1-dev-plus-aosp
Change-Id: I52d56e84620c85638798d949f8eb819387a01902
Diffstat (limited to 'libs/hwui/Rect.h')
| -rw-r--r-- | libs/hwui/Rect.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/Rect.h b/libs/hwui/Rect.h index 5786668addc5..eb05e9171335 100644 --- a/libs/hwui/Rect.h +++ b/libs/hwui/Rect.h @@ -73,14 +73,14 @@ public: bottom(height) { } - inline Rect(const SkIRect& rect): + inline Rect(const SkIRect& rect): // NOLINT, implicit left(rect.fLeft), top(rect.fTop), right(rect.fRight), bottom(rect.fBottom) { } - inline Rect(const SkRect& rect): + inline Rect(const SkRect& rect): // NOLINT, implicit left(rect.fLeft), top(rect.fTop), right(rect.fRight), |