OSDN Git Service

Merge "Update Paint#mFontVariationSettings in set() and reset()" into oc-dev
authorRoozbeh Pournader <roozbeh@google.com>
Tue, 30 May 2017 21:25:23 +0000 (21:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 30 May 2017 21:25:23 +0000 (21:25 +0000)
commit1ee4894e6c3c421937c3a229de5c87132aac369e
tree535856f14b3a7a7aefe4421e90d1bd8d97b49556
parent4f65a37a56c7b818fbdfbfa287df27a143d43717
parentd865c624bda8130bdb03238e875dec9df5491e25
Merge "Update Paint#mFontVariationSettings in set() and reset()" into oc-dev
am: d865c624bd

Change-Id: I45e58aa1a1ac7b5319a891e3d4f449099b13384d