aboutsummaryrefslogtreecommitdiff
path: root/icing/portable/platform.h
diff options
context:
space:
mode:
authorTerry Wang <tytytyww@google.com>2023-12-05 03:36:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-05 03:36:06 +0000
commit185356a15e7a16a0a86d331ea1c87ee42f8c4844 (patch)
tree26b4619f5921a4948b419d870be2dcd527d05fdf /icing/portable/platform.h
parentd7786c1d006962c09f64a08525386e5fb4b9450c (diff)
parente7b69188bb0a7111858430078478c3da02cebb42 (diff)
downloadicing-185356a15e7a16a0a86d331ea1c87ee42f8c4844.tar.gz
Merge remote-tracking branch 'aosp/upstream-master' into androidx-main am: e7b69188bb
Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2858548 Change-Id: Ib31d172049889444a55c31941ba9f7460d39148d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'icing/portable/platform.h')
0 files changed, 0 insertions, 0 deletions