| commit | b7b9f4aff9e16391300cb60138ed05ede617604f | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Tue Aug 18 16:05:34 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 18 16:05:34 2020 +0000 |
| tree | 8bda65788bfc8cb8d5fa647c59ac133934700103 | |
| parent | 4b57d15fa33be9f15285a3fd461227bd91a0db1f [diff] | |
| parent | 8af7727a859ae678f32c36e76aabdb7b3cf37115 [diff] |
[automerger skipped] Merge "Compose the main stubs jars from module stubs" am: bb7674fad3 am: 0c90961dcd -s ours am: 8af7727a85 -s ours am skip reason: Change-Id I255486112c03f237aa342cfb93f3b473a2f50470 with SHA-1 4f8e749775 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402651 Change-Id: I867536744dccb0fd6fa382057680f4147b59b368