From: Sergey Prigogin <sprigogin@google.com>
Date: Mon, 8 May 2017 21:31:02 +0000 (+0000)
Subject: Merge "Merge "Fix a NPE with outlineProvider="none"" am: 46a4fbb2e4 am: 65d65ec14b... 
X-Git-Tag: android-x86-9.0-r1~4277
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=380983107b19cf4cd068441d8c9f5fec2c72a012;p=android-x86%2Fframeworks-base.git

Merge "Merge "Fix a NPE with outlineProvider="none"" am: 46a4fbb2e4 am: 65d65ec14b am: a3460f2bb1" into oc-dev-plus-aosp
am: 939ba35913

Change-Id: Ib427f57b4a505b1622758773f24c44e1bd69db6d
---

380983107b19cf4cd068441d8c9f5fec2c72a012