am 4cfcd710: merge in master-release history after reset to 4841666ebe6aba70a957ee47ed26dbc3e63d189c

* commit '4cfcd71064d22a8844267e785c842149e755287c':
  Fix incomplete refcounting and locking
This commit is contained in:
The Android Automerger 2014-05-24 14:52:56 +00:00 committed by Android Git Automerger
commit 2447f21d86

Diff Content Not Available