tree 2917a1e1e023f9bb06093cc7b340354a42871ca6
parent c47b1fc295df1fd6b9636a2efceae6cc6d588c29
parent ae023634bf8ebfec95ed6229a0b5a695c49dca84
author Shi Yuanjie <yuanjie.shi@sony.com> 1551402927 -0800
committer android-build-merger <android-build-merger@google.com> 1551402927 -0800

Merge "Fix to hide phone number printed in the log" am: b967dce9d9
am: ae023634bf

Change-Id: I3b54ecc96fc467975cb7fbcbf5325ed8b339d6fa