tree 830d9585f9155268a98744953dac82ed36d4f2c5
parent 8c615cb10cdffab052fa498cb3375b1a85482b28
parent 68be2dcd3fc02cbf1ccb01e87f553103f9c9904b
author Xin Li <delphij@google.com> 1599789736 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789736 +0000

[automerger skipped] Merge Android R am: a925b06d71 -s ours am: 68be2dcd3f -s ours

am skip reason: Change-Id If3301aad7610ef3d2472fcc677e9e89510fe652e with SHA-1 69934eddd7 is in history

Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/rubik/+/1422350

Change-Id: I4865e18c2693bc77b9f86b13b321d164eb87ea9a