tree 34d48c1d9b337020df7cda20c1d29b6cabf40d3d
parent a06ab43e984c092d216ade777ef25fb5f6399b6a
parent 5663e9c2adcddd43a01429cac018c77aa86428a2
author Scott Kennedy <skennedy@google.com> 1363727777 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363727777 +0000

am 5663e9c2: Merge "Fix folder NPE in DrawerItem" into jb-ub-mail-ur9

* commit '5663e9c2adcddd43a01429cac018c77aa86428a2':
  Fix folder NPE in DrawerItem