commit | 41de637564ba00486b861f1fa85d7f9970dfbaff | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Nov 05 04:57:18 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 05 04:57:18 2020 +0000 |
tree | 6212d87f05970a061d35a3ab4ae556a55a089329 | |
parent | 38d71e2e01f93437c00b9df959c5210f96e3efa2 [diff] | |
parent | d58cc389e4d6dfd83c7e084cab9d7f6825cb27f6 [diff] |
[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 2c67d7f24a am: e666aa1e3d -s ours am: 64363d8b8d -s ours am: d58cc389e4 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487068 Change-Id: Ie9a9c0b904a7491a785cdb40dbf2225977a409d7