summaryrefslogtreecommitdiff
path: root/core/jni/fd_utils.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-01 04:03:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-01 04:03:24 +0000
commit06f95ff0b7c6633eda9ca994f28dc614fa1b8f6a (patch)
treeaaf2abe38ba08ef23f69b085ca9f53756d24faf8 /core/jni/fd_utils.cpp
parent2e99ad6290a60ec692c3fcbc29e9b20ca41d542d (diff)
parent530d5efed9100d4f1f3d0cec5f361b76d89b5378 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 4d1067b315 -s ours am: 530d5efed9 -s ours
am skip reason: subject contains skip directive Change-Id: I5de75be02cde7a42545e91bc8ce77bd75b68069c
Diffstat (limited to 'core/jni/fd_utils.cpp')
0 files changed, 0 insertions, 0 deletions