tree 74f23a677dc1297e593bda4df03d031cc1b69d76
parent 9e74d99bed7156a8560a51b0ecd2ba330aa3561e
parent 4b76455543a016a33689b4eb67fe23338fbac4da
author Tony Wickham <twickham@google.com> 1470173534 +0000
committer android-build-merger <android-build-merger@google.com> 1470173534 +0000

Merge "Update shortcuts font to match spec." into ub-launcher3-calgary
am: 4b76455543

Change-Id: Ie49f6565e9720eaf7eac013edb90c6ac821f7b4d