tree 7aa1ce39b517991db26398c62bc30253aca0f19f
parent 06a0aa5fc0e9d8b2cf2c7347c1b37c497e3a9c86
parent 982596d4c4a01f4dd818833ea0f7d18bd82cf5db
author Alex Sakhartchouk <alexst@google.com> 1321465706 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321465706 -0800

am 4c593010: Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1

* commit '4c593010dddc6d2972bab87b30bd1b11987a09e1':
  Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body.