tree 56c3f120042c3dfc2602bdd95a74ad2d1d9f9bb0
parent ce393373b73e1a1f30ce9bb41568d415cab7df49
parent 5c77c126b258924961a4a9c784177b4bcd403dd0
author Deepanshu Gupta <deepanshu@google.com> 1396576908 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396576908 +0000

am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev

* commit '5c77c126b258924961a4a9c784177b4bcd403dd0':
  Fix NPE in layoutlib. [DO NOT MERGE]