diff options
| author | Bill Peckham <bpeckham@google.com> | 2018-09-21 15:26:16 -0700 |
|---|---|---|
| committer | Bill Peckham <bpeckham@google.com> | 2018-09-24 16:54:37 +0000 |
| commit | 1730c08a2fd38f0ff8135692a855ada865130939 (patch) | |
| tree | 3440b8d9a7714995267162733d7d5bc2ba15bd9e /libs/hwui/renderthread/RenderThread.cpp | |
| parent | ad5b67067393c26e491cc7905ddc6d66d01ea2d0 (diff) | |
| parent | 2ffccea12a93ccc5e25187bd3d1337094b7b70d7 (diff) | |
Fix broken history.
History broken by
https://keystone-qcom-review.googlesource.com/c/platform/frameworks/base/+/35990/4
Merge commit '2ffccea12a93ccc5e25187bd3d1337094b7b70d7' (from the QP1A.180823.001
platform update) on q-keystone-qcom-dev using these commands. Starting point was
tip of q-keystone-qcom-dev. Commands used (edited for brevity).
7682 [2018-09-21 11:56:05 -0700] cd frameworks/base/
7689 [2018-09-21 15:24:47 -0700] git merge --no-commit --strategy=ours 2ffccea12a93ccc5e25187bd3d1337094b7b70d7
7690 [2018-09-21 15:24:59 -0700] git status
7691 [2018-09-21 15:26:16 -0700] git commit
7692 [2018-09-21 15:27:53 -0700] git log
7693 [2018-09-21 15:28:33 -0700] git push origin HEAD:refs/for/q-keystone-qcom-dev/fix-broken-history
Change-Id: I3fbd83897bc0949721c5704f9b84023f83b7f482
Diffstat (limited to 'libs/hwui/renderthread/RenderThread.cpp')
0 files changed, 0 insertions, 0 deletions