tree 2a75e6193233c1cfb1c8fdf491173f46743cec7f
parent 42e508f2559e019d2fcc8f88adfd184b7a6bc3a4
parent c08442f363b23073608af7856ddbdb3ea60a6f37
author Vitaly Buka <vitalybuka@google.com> 1453250279 -0800
committer Vitaly Buka <vitalybuka@google.com> 1453250279 -0800

Merge remote-tracking branch 'weave/master' into dev_dev2

* weave/master:
  libweave: Add libgtest.a dependencies to Makefiles
  Fix assigning error in SecurityManager
  README: fix typo in examples rule