diff options
| author | Xin Li <delphij@google.com> | 2020-04-10 20:06:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-10 20:06:53 +0000 |
| commit | 9d0708e8e23ea3f22c38ff96d77c77d5b10bfac3 (patch) | |
| tree | 62baf1b5a74cc7a9bc39f35bb8c6b4840ac01ea9 /framework/java/android | |
| parent | 2763ead5352089578603baa3960e995e92e246bf (diff) | |
| parent | 60e931d52c771a132245d0be716d94358106acfd (diff) | |
[automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master" into stage-aosp-master am: f68e6a03f1 -s ours am: a06631b3de am: c3e34ed404 am: 60e931d52c -s ours
am skip reason: subject contains skip directive
Change-Id: Id6726b54c852a05b536d2f653eba5317e87c81b9
Diffstat (limited to 'framework/java/android')
0 files changed, 0 insertions, 0 deletions