tree 4fe7251a205084549891c75f158cb70813c20a1b
parent 56686fe8ce35e287ffbece5fe042aa2e654d73bc
author Alex Vakulenko <avakulenko@google.com> 1448392696 +0000
committer Alex Vakulenko <avakulenko@google.com> 1448392750 +0000

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

This reverts commit 56686fe8ce35e287ffbece5fe042aa2e654d73bc.

Change-Id: I404b98dbaf341de4ea47575251b28ea382bc7f4b
Reviewed-on: https://weave-review.googlesource.com/1637
Reviewed-by: Alex Vakulenko <avakulenko@google.com>