tree f43df973e004001285d0778c6139842aa841d942
parent 898f152d79e06828675361a176772cdf1cef56ca
parent 382aa1835c3e0e88d5ca33263cee39cc3ac5711e
author Michael Jurka <mikejurka@google.com> 1339458522 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1339458522 -0700

Merge "Fix NPE" into jb-dev