tree c325b38ebfaa236f96d13ac57cf19ccbae18c7e5
parent eb1cbe5e7730995015026d45f18a95f9dad1f424
parent 771b57f42f8acf6452fac557d70d35649b480c25
author Android (Google) Code Review <android-gerrit@google.com> 1247161035 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1247161035 -0700

Merge change 6602 into donut

* changes:
  Guard against a searchable being null, which it shouldn't be, but we don't want to crash on an NPE if it is. Previously Searchables was capable of accidentally populating a null searchable in the list of searchables for web search which was causing an NPE here. The fix for that is in change 6600.