Skip to content
Commit b2a175fe authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

[automerger skipped] Merge "Make NtpTrustedTime safer / expand docs" am:... 

[automerger skipped] Merge "Make NtpTrustedTime safer / expand docs" am: 49c903a0 am: 0330b350 am: a54fe6e8 -s ours
am skip reason: Change-Id Ie09da9db5d853b59829886a020de21a88da5dd51 with SHA-1 65f0f31b is in history

Change-Id: Ia34911cc0f3e2a2fcaf3c48177c3f70a938c75b0
parents 43b5e882 a54fe6e8
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment