diff options
author | Xin Li <delphij@google.com> | 2020-09-11 03:58:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-11 03:58:59 +0000 |
commit | a0c9117211965e259ff81194f7438d29a345555a (patch) | |
tree | d994ba1f68b80d95542ca7fd323894022eab0960 /libs/hwui/renderthread/CanvasContext.cpp | |
parent | 0a2746e3db8846d9e7440d07c08a52858cc1de02 (diff) | |
parent | 8db74914220253e485a293150fab94098b188812 (diff) |
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: a9f9ccbc9a -s ours am: 8db7491422 -s ours
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395
Change-Id: I47087cabc2093c6de6116f11f660aa624dcb260e
Diffstat (limited to 'libs/hwui/renderthread/CanvasContext.cpp')
0 files changed, 0 insertions, 0 deletions