Commits
John Spurlock authored and Android Git Automerger committed 809eeb94b0cM
am 22458a49: am 5c87f533: Merge "Revert part of fix for b/7377776 to fix b/7411356." into jb-mr1-dev * commit '22458a49128b2fea4ec2065dc056b194253cb5f0': Revert part of fix for b/7377776 to fix b/7411356.
Showing diff to374876666cd