summaryrefslogtreecommitdiff
path: root/libs/hwui/SkiaCanvas.cpp
diff options
context:
space:
mode:
author Jean-Michel Trivi <jmtrivi@google.com> 2017-04-18 16:12:41 +0000
committer android-build-merger <android-build-merger@google.com> 2017-04-18 16:12:41 +0000
commit3bf4d5eb09b3573d8d2e90bb02027f70fc851731 (patch)
treed5c113cb1634cc2162c5c32688587f72f7f2bd51 /libs/hwui/SkiaCanvas.cpp
parent7c82f31d580804fe2d1515c28d8d753a80f2300e (diff)
parent3d29751790adf2a537c3391d2124aab6fbc5d22d (diff)
Merge "Vol key presses: active stream has priority of set control stream" into oc-dev am: 031cf14582
am: 3d29751790 Change-Id: I5a686ceb2be219bf6a1c3f26012ff0c97c2652e9
Diffstat (limited to 'libs/hwui/SkiaCanvas.cpp')
0 files changed, 0 insertions, 0 deletions