| commit | c8878bd94267971ad6367e115a26057c534b76f8 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Fri Nov 13 16:39:31 2020 +0000 |
| committer | Tyler Gunn <tgunn@google.com> | Fri Nov 13 16:54:21 2020 +0000 |
| tree | 77f5e2f42179a5df9406513bc76c3c94d72b9f12 | |
| parent | a2b16e18ec9c37d3b71a03d4d0ce7972e4d667f5 [diff] | |
| parent | 74f9c2a0cc9327899169649b716dff06e23e61cd [diff] |
resolve merge conflicts of 74f9c2a0cc9327899169649b716dff06e23e61cd to master Merge conflict resolution for merge from AOSP CL: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496302 Root cause of merge conflict is delta between AOSP and internal in how the aosp current.txt files are stored. Bug: 163085177 Change-Id: Ia30f9f3203f2d5220186e194a81bbe321fe6e0d6