tree 8737bb821dbf79816acc067ddf939d7eb6f0b01b
parent 72432ab0f4c5be295a51570bea199a469d827f45
parent 88901af27b7d95e8d04b68c5d8e6c37ba92ea78e
author Anton Hansson <hansson@google.com> 1602502619 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602502619 +0000

Merge "Move the dist rules from monolithic to merged rules" am: 99398da506 am: 3b8ec2dcac am: 88901af27b

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

Change-Id: I2d3150f9b3a071f25236a09b07fb9c5bf008480f