tree 37945bf749bb39078e4f4f24e1ea375a99d9d553
parent 6a94caa048121858ee8e71f84caf7b9ae1f940df
author Brian Carlstrom <bdc@google.com> 1376960995 -0700
committer Brian Carlstrom <bdc@google.com> 1376960995 -0700

Tolerate both old and new java.util.concurrent.ConcurrentHashMap

Change-Id: I87397bbb662d7dd8cb0683fc08bd35b401034357