tree 7f57ba7623a0cbf9621452f92e900095242090d5
parent 4030f988c56a3abe9dba450bfa42c075ef66fe25
parent 340025151a619931897234503cbebb267d2f8a7a
author Luis Hector Chavez <lhchavez@google.com> 1464820908 +0000
committer android-build-merger <android-build-merger@google.com> 1464820908 +0000

Reland "Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\'" am: 83db8f75af am: b20409af35 am: da4667b75a
am: 340025151a

* commit '340025151a619931897234503cbebb267d2f8a7a':
  Reland "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'"

Change-Id: I1b6dae0960be5e66da81dab806d5c6a3033f8327