tree ff8c16ea1031315588f50260f0f32f6043325101
parent ff9f4538c09399030fa73e3e65a167852cb91e8f
author Steve Paik <spaik@google.com> 1437004337 -0700
committer Rakesh Iyer <rni@google.com> 1447356583 -0800

Workaround for adp8064

This is a squash of I78e107c763e9969b0d6e0b31fad806be4079e23b
and I71ed35d1900ef48d731ed744ed545135445040ac

Change-Id: I4143021ecb3530fa618ae259b2206d5b5eb93aeb