tree e66b0fb458a71a808fdb7bf880c6b1ed1882bcbe
parent 43625e411feabd7df36a8768ba8c4eca58a22e4d
author Luis Hector Chavez <lhchavez@google.com> 1464737406 +0000
committer Luis Hector Chavez <lhchavez@google.com> 1464737649 +0000

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

This reverts commit 43625e411feabd7df36a8768ba8c4eca58a22e4d.

This needs to happen in a staged fashion to avoid build breakages :/

Change-Id: Ie5474629bd301d7af27ee6167988b0381ac73271
Reviewed-on: https://weave-review.googlesource.com/3700
Reviewed-by: Luis Hector Chavez <lhchavez@google.com>