am 4bc899e6: am 8d38f574: am 7d4f0961: am ef2d1555: am c627f642: am 9a6ff5dc: am c7d41589: Merge "Use private object as a lock instead of synchronized method"

* commit '4bc899e6c9b015b4e61087a5167face0da99b60e':
main
Tadashi G. Takaoka 2013-05-15 10:57:57 -07:00 committed by Android Git Automerger
commit 39b25828fe

Diff Content Not Available