tree 2f8dc6e6c6769368452fe23acf7b55a3a07cd781
parent 0c099c1673c8340134848209305df4a20ee50ce5
parent 3f0ac62e87d341d13f257fd1b54149e75f83d96d
author George Mount <mount@google.com> 1340041951 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340041951 -0700

am 3f0ac62e: (-s ours) am f7ae26a1: Merge "DO NOT MERGE Close hole in synchronize-protected member variable." into jb-dev

* commit '3f0ac62e87d341d13f257fd1b54149e75f83d96d':
  DO NOT MERGE Close hole in synchronize-protected member variable.