tree 428e1f8c87d313237cd60166a7bf627dac9f879b
parent a328a0d83a1149b884dd49d302414d8080d28e40
parent 6a816b007c0eaa621e26291c97c616209cfac09a
author Jon Miranda <jonmiranda@google.com> 1507578294 -0400
committer Jon Miranda <jonmiranda@google.com> 1507578294 -0400

Merge branch 'ub-launcher3-dorval-polish2'

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