tree cf21112019e5a5ed31c50db6f9aeccb55940fc6b
parent 7d6785b6d8e25cd559dca9ee1fe5bb772e95d279
parent 7f81f5473b9ef1a6dbab748e2329014e0933e0f6
author Bill Peckham <bpeckham@google.com> 1603400857 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603400857 +0000

Merge "Include 'name' in props; use post-sanitize module name." am: 7f81f5473b

Original change: https://android-review.googlesource.com/c/platform/development/+/1469871

Change-Id: I23789ff1fa3119dd7bd70bac7439409ea72fbc2f