tree 55300976e3ed22a34812ff4ad0261cb1efbd035d
parent 8d48e22c4e0d008776370deee9cc6a46b3597930
parent 46793d1aae2992ff4f6810410cdc5d219e2cc63c
author Anton Hansson <hansson@google.com> 1605019225 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605019225 +0000

Merge "Re-submit "Add genrule for combined srcjar of modules"" am: 181885c868 am: 15753f03cc am: 46793d1aae

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494096

Change-Id: I12a919c3ab71fe40682bd366628c61afdaf09b33