commit | c605a0eddf0c7fe83d6f6d7ec8876226ea12dbbb | [log] [tgz] |
---|---|---|
author | Anton Hansson <hansson@google.com> | Fri Feb 05 18:19:15 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 05 18:19:15 2021 +0000 |
tree | c1ad8aefa34f9429052b5fbc7f0800aa46715d09 | |
parent | e787af138289583d979c46022dcf65792acc34a4 [diff] | |
parent | e3134523be42834977c47b9a304a3ded19f1021f [diff] |
Merge "Temporarily add IKE to non-updatable stubs build" am: 6869137dfa am: ddd98663b5 am: e3134523be Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1576466 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie2ef8f60d78bbf1d855bfb487d7e040c7c06145d