tree 4794622a3f5869eb9fda027f152051a2618073e3
parent 466cd165d1af06087918260bb0b5bdf5e52105a3
parent ac18fcf3e15a74d9980ea6b09d2482a86d7fdf18
author Vitaly Buka <vitalybuka@google.com> 1454116347 -0800
committer Vitaly Buka <vitalybuka@google.com> 1454116347 -0800

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

ac18fcf Merge: Add write callback into SaveSettings function
d1e6c4f Merge: Add |name| into LoadSettings/SaveSettings
6ae6e52 Remove event_http_client example provider.
ec47eb0 examples/provider/wifi_manager: find iface name
43bf6b7 Update gtest
e03c094 Include of gtest_prod.h only building unittests