summaryrefslogtreecommitdiff
path: root/libs/hwui/renderthread/DrawFrameTask.cpp
diff options
context:
space:
mode:
authorZach Riggle <riggle@google.com>2015-09-17 22:52:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-17 22:52:42 +0000
commitcd8fc98287d6f2fd8cc0c680b67b051e7fb0e1da (patch)
tree87249f8367608e95876ebaaafa93543bb5c497c4 /libs/hwui/renderthread/DrawFrameTask.cpp
parentd5334121c495689b7d72b6b7ff9c471c8b7d7906 (diff)
parent3c9ffc2d5ae7152ae8b303a7b3c8da0a2fc734cf (diff)
am 3c9ffc2d: am 2ebcf2c2: am ad0acf1d: am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev
* commit '3c9ffc2d5ae7152ae8b303a7b3c8da0a2fc734cf': DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Diffstat (limited to 'libs/hwui/renderthread/DrawFrameTask.cpp')
0 files changed, 0 insertions, 0 deletions