tree a741db3050f7d0c90d6de0978111fba99a185357
parent 5febbd2a840c430c6f3320668920c5d28d28debc
parent 43587ec66d2fc42bd87487bc253f5ed57f923a99
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580773886 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580773886 +0000

Merge "Add support for casefold and product ID to format" am: 2e10d8f74f am: c50d82e418 am: 43587ec66d

Change-Id: I80632b75f5f216a8b63b510e27628556aae126f9