tree b371c713c4dbb97f9ba274065659f552618079e8
parent c9c0133f85680ea12770d37c35361b52bf1c3d39
parent 31e09e965e7d334068ba7f945154f649a2ea512b
author Daniel Mentz <danielmentz@google.com> 1537211629 -0700
committer Daniel Mentz <danielmentz@google.com> 1537308943 -0700

Merge tag 'LA.UM.7.1.r1-04500-sm8150.0' into pi-dev

"LA.UM.7.1.r1-04500-sm8150.0"

Bug: 115750368
Change-Id: I7764fe745b38c83367bf1f3aee24462a139b5dda