Move timeout start to before tryLock().
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=41700665
Add NullPointerTester.acceptIllegalArgumentException().
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=41744871
Rollback

*** Reason for rollback ***

Rolling forward now that the users depending on the error message have been migrated.

*** Original change description ***

Rollback

*** Reason for rollback ***

People depend on the exact error message.  (They should feel bad, and they'll need to get fixed.)

*** Original change description ***

Simplify and organize various Map implementations.  Specifically:

* factor out Hashing.smearedHash
* organize the CompactHash collections'
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=41788418
Optimize IntMath and LongMath by using a branch-free helper implementation of the expression (foo < bar) ? 1 : 0.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=41793002
Correct two typos in IDN doc.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=41796838
Allow FluentIterable.transformAndConcat() to accept a Function<A, Iterable<? extends B>>.
http://code.google.com/p/guava-libraries/issues/detail?id=1260
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=41841084
Add a simple test that shows why US_ASCII is usually a bad choice.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=41853734
Change EventBus to remove the thread local Queue after dispatching events. (Guava issue 1263: https://code.google.com/p/guava-libraries/issues/detail?id=1263)
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=41857158
Merge remote-tracking branch 'google/master'