tree 0aa57fb490af011a0fcd8991d26cad088fdb6b83
parent 5ee51191ee7569626cff2373d841fe5e149bb4c3
parent 57ce5831872f841cae84b39e3fe5101d9e1c18e3
author Alexander Dorokhine <adorokhine@google.com> 1610080093 -0800
committer Alexander Dorokhine <adorokhine@google.com> 1610081009 -0800

Merge remote-tracking branch 'goog/androidx-platform-dev'

* goog/androidx-platform-dev:
  Update Icing from upstream.
  Add Sync CL number to AOSP external icing.
  Update Icing from upstream.
  Update Icing from upstream.
  Migrate existing jarjar plugin users to shadow plugin

Test: Presubmit
Change-Id: I00137d99897df8567d31a50dcb3c58bf9a5662e6