tree 4d7b0464f62c97255cdd0629a1608eaca950a271
parent 2c34ec9189b69a925fb87fc82f264ac98955881b
parent 7843f4925edcb5ef4401643b1b8cdbcad6911afc
author Tiger Huang <tigerhuang@google.com> 1605499183 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605499183 +0000

[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