tree bb09e16aa18d3893aeced16a64cbe431e6be4d19
parent 8ac0612af5084aa744ccff76a8b48268f89affbc
parent 56712e8a76eb79863400b5bde081ae125bbe9e6c
author SongFerng Wang <songferngwang@google.com> 1575893279 -0800
committer android-build-merger <android-build-merger@google.com> 1575893279 -0800

[automerger skipped] Merge "[Mainline]Remove PhoneFactory.addLocalLog and PhoneFactory.localLog" am: 28d8b57340 am: de9f000c8d
am: 56712e8a76 -s ours
am skip reason: change_id I5df842b0dc9e85297266e0651f441f739f36dc2c with SHA1 bf3c3c4379 is in history

Change-Id: I1050c5c9ad54c6338346e2fd079095f452741b47