tree afcd76f4657bc76695040042590a55d7dfcd5e0c
parent 9cb3e1c84739b61fac7d9ef20c60a35b0f2ebfcd
parent 3cddfb862caa6611f4023e00e08dfe6f858d1a3d
author Xin Li <delphij@google.com> 1570048182 -0700
committer android-build-merger <android-build-merger@google.com> 1570048182 -0700

Merge "Sync with upstream 643521d:"
am: 3cddfb862c

Change-Id: I1de18087fe19b5055b654a37e70bda8603b4b513