commit | dc2c91f4f8b3d559c987c85b45578d93aafe8e43 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Jan 19 05:23:31 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 19 05:23:31 2021 +0000 |
tree | ba8bd33e66e57147fd419212e041b5739891d3a0 | |
parent | 4a5b422455abf642fbe994cf5fb269b2a91b83be [diff] | |
parent | a8a4a460774937b2e4c6d91a494901c955aa5891 [diff] |
Merge "Fix CaptivePortalDataTest#testParcelUnparcel on R" am: caa5817c33 am: a8a4a46077 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553816 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib62b14620dd2aa880bca086d7144b05e088d236d