Commits

Deepanshu Gupta authored 64dc0380127
Fix layoutlib [DO NOT MERGE] Fix a NPE. The cherry-pick differs slightly from the original to remove changes not relevant to the current branch. Bug: 11140701 Change-Id: Id92fc5359acf6dde1bcdbc781aaf637fdb6eecbf (cherry-picked from 87be67f91719234cbd381ff0242b5efc8b6aa257)