commit | 9d63291dcd9e9611868af7e095e7bcefb6b50d7d | [log] [tgz] |
---|---|---|
author | Anton Hansson <hansson@google.com> | Wed Nov 18 16:44:42 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 18 16:44:42 2020 +0000 |
tree | f102e3ff82a12689b8960ca327a604e17b9ffb9a | |
parent | 37d2ee23c257217503bc50061cdb48c74ae7947b [diff] | |
parent | 6e9e62bdad1de06197e146c92c0d5a20e2e73ceb [diff] |
[automerger skipped] Merge "Remove system-*.txt files" am: c9dbe6ed8b am: cf67a70f68 am: 34cbddb139 am: 6e9e62bdad -s ours am skip reason: Change-Id I8d5f0a132aa307d88fbc2bd7521cdd4bdd8c6cee with SHA-1 d5cba3455f is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1497596 Change-Id: I34b096ea9db512cec90cf9f1e78016601d7e5d69