tree 0436757a5db04cf40f06152b6afc213e1dd3ebdf
parent 686b91faf302b99dc25007476427d3b843fea4b0
parent 20ad1ebc31f337b60fd4a68ab675bf5afabca625
author Xin Li <delphij@google.com> 1560810408 -0700
committer android-build-merger <android-build-merger@google.com> 1560810408 -0700

Merge "Sync with upstream 95647bc8:"
am: 20ad1ebc31

Change-Id: I1dd17c9021a7d712764b777bbb4efa5bf16faa4a