tree 86e6074f924c1fcacff456603f25d3f9aa48801c
parent 6ab3ce1219547729376703b816dd2ac1b21214d4
parent 65d65ec14be2a1f3732c711f5f2be5e34e526bea
author Sergey Prigogin <sprigogin@google.com> 1494277957 +0000
committer android-build-merger <android-build-merger@google.com> 1494277957 +0000

Merge "Fix a NPE with outlineProvider="none"" am: 46a4fbb2e4
am: 65d65ec14b

Change-Id: Iae0cc89cea82009620a75ac03de86a72ea20f1bb