tree cb19f4f8e536388d9338047497da25f1906d87cb
parent 1665c8e1012e535743683d9812bf28c35ee2f10a
parent 54466bc4412acf33a59af59d9eadde54c22b2ebe
author Michael Lentine <mlentine@google.com> 1422483785 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1422483786 +0000

Merge "Remove lock around ref count check in terminate." into lmp-mr1-dev