| commit | 6fc96572eb1a0bf09e97524c1e4902cabf474d9d | [log] [tgz] |
|---|---|---|
| author | Tiger Huang <tigerhuang@google.com> | Mon Nov 16 03:59:43 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 16 03:59:43 2020 +0000 |
| tree | 4d7b0464f62c97255cdd0629a1608eaca950a271 | |
| parent | 2c34ec9189b69a925fb87fc82f264ac98955881b [diff] | |
| parent | 7843f4925edcb5ef4401643b1b8cdbcad6911afc [diff] |
[automerger skipped] DO NOT MERGE: Only restore the positions of types which are controlled am: a496e03194 am: 7843f4925e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12967036 Change-Id: I2317a9f7b401116cb8952897ab0a43a172a95dd9