tree 23794919adf7ff1946e618a6ac319517cc8cb094
parent 7ee427714d4621bd9a0b15364a073aff60ebf20c
parent 09e50cdbc62938b178f4c9a66b3cec8a466daaa8
author Jean-Baptiste Queru <jbq@google.com> 1290042966 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1290042966 -0800

am 09e50cdb: Merge "Reorder lock acquision vs try."

* commit '09e50cdbc62938b178f4c9a66b3cec8a466daaa8':
  Reorder lock acquision vs try.