tree 9d3bed458d6c3a66b6e66593900f038393fcd2f6
parent d377343d1ef1016ac1a662417f9b356f8e25275c
parent d1689bfca25bd9ac61c7d12ef7308cfee7681132
author Sunny Goyal <sunnygoyal@google.com> 1524767469 -0700
committer android-build-merger <android-build-merger@google.com> 1524767469 -0700

Merge "Avoid crash when widget previews have no intrinsic size" am: f51b706439
am: d1689bfca2

Change-Id: I7ed4604a24774f802a764e787122c3339befda5b