diff options
| author | 2022-02-28 22:10:39 +0000 | |
|---|---|---|
| committer | 2022-02-28 22:10:39 +0000 | |
| commit | 3b484d916d7836f30e68f61353f749e955f20601 (patch) | |
| tree | 5effd89f90d8baf024fe80722b95ee0cd015fe53 /libs/androidfw/ResourceUtils.cpp | |
| parent | a2dc88619d8b732bfe200e4eac0f3b321022568c (diff) | |
| parent | d58b4422a5d2e7c0d3a58f5c8f66bb79da5ae298 (diff) | |
[automerger skipped] Merge "Allowing launch cookies to be passed via pending activity starts" into sc-v2-dev am: 42b2cec2d1 -s ours am: d58b4422a5 -s ours
am skip reason: Merged-In I339ea827836fa53ab5bb1617a72f9e0e5ae0f5ec with SHA-1 30362a07af is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16968731
Change-Id: Ia3fe6708696786dba449e22680ec9152a8a6ef2f
Diffstat (limited to 'libs/androidfw/ResourceUtils.cpp')
0 files changed, 0 insertions, 0 deletions