tree c736302b3b90e0e498c172dafa235a760a8ea91c
parent 1a33e7f9ba470789f1fc0e9520bfaa6dba93303a
parent 89f91d09ab7b1abfaece71fadf958033a6559ba1
author Martin Fick <mfick@codeaurora.org> 1338485573 -0700
committer gerrit code review <noreply-gerritcodereview@google.com> 1338485574 -0700

Merge changes Iaa8658bd,Ifdae88ec into stable-2.4

* changes:
  Fix deadlock on destroy of CommandFactoryProvider.
  Use AtomicBoolean for "logged" in CommandFactoryProvider.