tree efa352fd6eac95e22a511dfba51788c0a92f297f
parent 6447072324f5a4d759e7cce1a0ae71ccdfe58aa0
parent 65c509b75869d6bf60e51e8e35741b7c4fedeb6a
author Xin Li <delphij@google.com> 1579028854 -0800
committer android-build-merger <android-build-merger@google.com> 1579028854 -0800

Merge "Sync with upstream b60894b (svn revision 356657):"
am: 65c509b758

Change-Id: Ia0e27fa3249832993bf98e1bb08231f0c5805b8d