OSDN Git Service

am 13fe5bbd: Merge "Add missing SHARED_LOCKS_REQUIRED attibute."
authorChih-Hung Hsieh <chh@google.com>
Tue, 28 Oct 2014 04:31:16 +0000 (04:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Oct 2014 04:31:16 +0000 (04:31 +0000)
commit9ebbaf131d0a2698353b995e5dbf4614deca86de
tree4c76c24991b0b43bead3496ff738d1ec9613be56
parent46c1690f9b81a2898a2377e28695050f6b876dc0
parent13fe5bbd636e4dd9b6d51e13932e6e55e354976d
am 13fe5bbd: Merge "Add missing SHARED_LOCKS_REQUIRED attibute."

* commit '13fe5bbd636e4dd9b6d51e13932e6e55e354976d':
  Add missing SHARED_LOCKS_REQUIRED attibute.