OSDN Git Service

am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
authorDeepanshu Gupta <deepanshu@google.com>
Fri, 4 Apr 2014 02:01:48 +0000 (02:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Apr 2014 02:01:48 +0000 (02:01 +0000)
commit29b4986ecce1592bd2fe62024bb187dded33c0af
tree56c3f120042c3dfc2602bdd95a74ad2d1d9f9bb0
parentce393373b73e1a1f30ce9bb41568d415cab7df49
parent5c77c126b258924961a4a9c784177b4bcd403dd0
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]