tree e58544d2ffb471ad2d6fc3c5889743a2104be817
parent 005f45ee681469ee0ca63adb9b4ecf584735c010
parent 486754a4dbbc71078bd46804cd7cd5ebfd58d918
author Petri Gynther <pgynther@google.com> 1541733701 -0800
committer Petri Gynther <pgynther@google.com> 1541734277 -0800

Merge android-msm-marlin-3.18-pi into -pi-qpr1

Change-Id: I6005ebfeded814ddc10bfc35b5b6e408c21628ab
Signed-off-by: Petri Gynther <pgynther@google.com>