tree adb1ad5a450630f8858bd246a1c0c57bae0b3d90
parent 18d2742f9f26de64ffe5aa753eed10cdd8263893
parent 83875d4f6fd0877a1d3af6d1e4da39fbfc8b12cd
author Alexander Dorokhine <adorokhine@google.com> 1605610140 -0800
committer Alexander Dorokhine <adorokhine@google.com> 1605611319 +0000

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

* goog/androidx-platform-dev:
  Update icing from upstream.
  Pull upstream changes.
  Add denpendencies to AppSearch CmakeLists.txt commands. To allow it re-make when file is updated.

Change-Id: I91403876c4265efee2c710951c00c299e65b3c2a