tree 983c8948a88e21f9d2de0c7352a8f1e26efb8e79
parent fb46415e803a7f20a7d48bf42106f3f40cd769dd
parent 230cf17fe6de48f1720724a272c653dcfc05a056
author Jon Miranda <jonmiranda@google.com> 1506723731 -0400
committer Jon Miranda <jonmiranda@google.com> 1506723731 -0400

Merge branch 'ub-launcher3-dorval-polish2'

Bug: 64937210
Test: flashed img
Change-Id: I85b9adc5c8bd5d0603112e8e115851b67dd23777