Backing out bug 891258 due to broken styling issues on OSX. r=backout
Bug 1019045 - Unify magnifying glass/search icon. r=margaret
Merge m-c to fx-team. a=merge
Bug 1062566 - Update to Java 1.7 and bump SDK version in AndroidEclipse build backend. r=rnewman
DONTBUILD NPOTB
Bug 1062552 - Use empty string as title if no title provided when adding a bookmark. r=ckitching
Backed out changeset 65e611823b0f (bug 1062566) for checktest failures.
Merge fx-team to m-c. a=merge