tree f9e10ea4218ad59cfa7ba41fc35e23289ff0a115
parent 5734b2f40e6a4487efded994a82fb5a6fd3680a0
author Alex Vakulenko <avakulenko@google.com> 1448391899 +0000
committer Alex Vakulenko <avakulenko@google.com> 1448391968 +0000

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

This reverts commit 5734b2f40e6a4487efded994a82fb5a6fd3680a0.

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