| commit | 9e6770a6b2d2830fa6a0996e52f42c2d4905f605 | [log] [tgz] |
|---|---|---|
| author | Ryan Mitchell <rtmitchell@google.com> | Mon Dec 14 22:54:40 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 14 22:54:40 2020 +0000 |
| tree | 9fe44b80157b8c7e3f7fb2fe6cf3efffa4d149f0 | |
| parent | f9b55b35f7f5fe6f161bb7682811087994e92890 [diff] | |
| parent | ccd5ca9bc42ace7291c970b0412445e7d433c219 [diff] |
[automerger skipped] Set resource id correctly when resolve fails am: e7ab62723a am: 9e78098e85 am: ccd5ca9bc4 -s ours am skip reason: Change-Id Iad1760c0e246da1a4bf64d1c2ec60bb08da32d06 with SHA-1 43d2f21d62 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519910 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I02c14357286dd07440a2e8451987df99df6f82cb