tree 2a7a51fda3383a86848454a6e6473a3db6fdccc0
parent 1dfda9dafb2e62787a92a43c3ee5c8b9f309759d
parent 09980abea745ade1cee73d49a8e533643df62042
author Xin Li <delphij@google.com> 1561586944 -0700
committer android-build-merger <android-build-merger@google.com> 1561586944 -0700

Sync with upstream 95647bc8:
am: 09980abea7

Change-Id: Ica63752553b101d41486cb958076af5db6ba17ba