commit | 7f1f6e47ea047fde1a51f5bf7e1f02bdcc54fdf2 | [log] [tgz] |
---|---|---|
author | Anton Hansson <hansson@google.com> | Fri Nov 06 17:00:13 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 06 17:00:13 2020 +0000 |
tree | d498ddfeb8edbde08ba1eba3b9a84b2d1376479b | |
parent | bf94c12f9d8b8992fb46ffca67fb052ccd8d8f76 [diff] | |
parent | 6af2ef3ce67f2914692afba7c2e58ead8a56dc61 [diff] |
[automerger skipped] Merge "Add genrule for combined srcjar of modules" am: 1452dc60ca am: 730982b142 am: c36ad8233e am: 6af2ef3ce6 -s ours am skip reason: Change-Id Idfc94cdb3317d3bde0b29fd8da0a9ccef47377f9 with SHA-1 5d0687a2ef is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1489716 Change-Id: I34b14a8357cccf54abbe54bc5e570f606940220b