tree cecf31deac4ccba4152d2fb39d3427cebf95e8d8
parent 5bf1d38c0f0294a6632c0c6b2c0ba6bd642aa1c0
author Ian Rogers <irogers@google.com> 1376927662 -0700
committer Ian Rogers <irogers@google.com> 1376927724 -0700

Build fix.

A static field was moved from an inner to an outer class in ConcurrentHashMap
leading to a disallowed call.
Also, tidy comments on other java.util.concurrent black listed classes.

Change-Id: Iccd808766dcd5406a5bb49a4b98f570606730250