diff options
| author | 2022-09-26 01:25:55 +0000 | |
|---|---|---|
| committer | 2022-09-26 01:25:55 +0000 | |
| commit | 40b5a52b49d40d1dcc1283ff769a774058009144 (patch) | |
| tree | 323d4df1544f7de603c8f1663d34194fc0ed0833 /libs/androidfw/StringPool.cpp | |
| parent | e6d0a468f9c8012f7b9778c3a9e6208ba6220eae (diff) | |
| parent | c30420a5cfba5c4896f2c1c35e69fe7a8c4d3c9f (diff) | |
Merge changes from topic "presubmit-am-e095dcb8dc634f1bbc080231db8e0ba1" into sc-qpr1-dev
* changes:
[automerge] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied 2p: 7af50c4d5f
[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions