| commit | ec522fffcd1556d8148e5b040b63c075dcca2316 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Nov 06 04:25:21 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 06 04:25:21 2020 +0000 |
| tree | 5d31737b467cfb7f391dbcd2cc8b708965efc7a9 | |
| parent | 4fdadd4b92e431571794026e040699669b5e13ab [diff] | |
| parent | d39d8ce0333748dfc475e227c1a32b17d988837f [diff] |
[automerger skipped] Merge changes from topic "12933388" into qt-dev am: ebf67ea3b2 am: da1ea4bc80 -s ours am: d39d8ce033 -s ours am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 33e24c883c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12986651 Change-Id: Iab6d04caa3de38172c7d89f131ee4b8feb82b036