tree 34d48c1d9b337020df7cda20c1d29b6cabf40d3d
parent 5a393781efa38765b264ea2df246103aad91786a
parent e286407580a25914a122480540a2f0be0affcde4
author Scott Kennedy <skennedy@google.com> 1363727670 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1363727670 +0000

Merge "Fix folder NPE in DrawerItem" into jb-ub-mail-ur9