tree a1d53259acad0538184ab273ccb7c8ff663a57b9
parent ebf4417cd8fdfdcf09936fc07433f2c14c5515ef
author Colin Cross <ccross@android.com> 1491587433 -0700
committer Dirk Vogt <dirk@fairphone.com> 1501098385 +0200

Merge remote-tracking branch 'aosp/upstream-master' into master

FPIIM-1367

Bug: 32096780
Test: mmma -j external/skia
Change-Id: Ia60d7b9984c1007e82bfea10c1a6df32418100d5
(cherry picked from commit bd503d67f403ca1e1d33226626c494d5513701e4)
(cherry picked from commit d7c3ad1d95c38b33c49a462f2647dc10f1fff7b7)