tree 7a91446d1791bbcbe997a68c66b26e814c5d902a
parent a59c27dd6674a31c875b0baa86519caec628ca2d
author Deepanshu Gupta <deepanshu@google.com> 1381980471 -0700
committer Deepanshu Gupta <deepanshu@google.com> 1399339395 -0700

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)