diff options
| author | Diego Wilson <diegowilson@google.com> | 2019-03-06 13:52:12 -0800 |
|---|---|---|
| committer | Diego Wilson <diegowilson@google.com> | 2019-03-06 13:52:12 -0800 |
| commit | 4a913b2fb2dd209fb67d0753b6f92dd94ad260e4 (patch) | |
| tree | 82a767b4a5c300dc2caaf3499a74a034a8dfee06 /rs/java/android/renderscript/RenderScript.java | |
| parent | 5bbae6e5647248f37a44052a4b02af21979026fd (diff) | |
| parent | 658147daf99557bdf52901aae2a5cd2db7ae1458 (diff) | |
Recover p-keystone-qcom changes
Commit ea2637ae08d04caac1f0c3dfc846de899e0c97a7
merged p-keystone-qcom to q-keystone-qcom-dev
but accidentally ignored all changes p-keystone-qcom
changes.
This change recovers p-keystone-qcom with the following process:
1. Checkout q-keystone-qcom-dev before the bad merge.
2. Merge in p-keystone-qcom.
3. Merge in the tip of q-keystone-qcom-dev.
The following changes were skipped because they
were missing corresponding changes in vendor projects:
Commit 4cfbecf2d4658558a1a810ed3e072fa0fbd5c77d
Commit d3dddee4164f7cf0df69356353c2256b1ba81cce
Bug 127358279 was filed to ensure these changes are
cherry picked to the q-keystone-qcom-dev branch.
Commit 0885454bd198dc03139758f7e748de9c15786e1d
was skipped because it causes a failure in
com.android.systemui.tests. Filed bug 127691646 to
cherry pick this commit later.
Bug: 122457644
Change-Id: I5a66744c773c05d4c2b716695782483d0353f4e7
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions