| commit | 095fe5e396a8c977b807b89effa73afa930d6686 | [log] [tgz] |
|---|---|---|
| author | Shawn Lin <shawnlin@google.com> | Tue Jun 16 09:32:54 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 16 09:32:54 2020 +0000 |
| tree | 6c1e742788d81d233286e57d5b16e3eef13e6af5 | |
| parent | f0ab382fae97f7d9a7fb9257249385e26e0e08b9 [diff] | |
| parent | 1c2e8eafffd0942c3289216a714dc043e5ddf89c [diff] |
Merge "Fixed the conflict of the release methods of ActivityView & TaskEmbedder" into rvc-dev am: 1c2e8eafff Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862402 Change-Id: I9ab450adab3542aa3d8b05ddccfd015dcc657a1c