tree e83c06e294da4f7611324fce351a48a6e7c0b21d
parent cf1fe148a6a53f4eff6357bc445ce4f7d450b5d1
parent ec9d8481ae5deaaf7901f944b06682e77b978881
author Alex Vakulenko <avakulenko@google.com> 1449779762 -0800
committer Alex Vakulenko <avakulenko@google.com> 1449782760 -0800

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

Pulling new changes from libweave into AOSP

Change-Id: I20b9773df61c40f42447f7a890bdbfcf54e5c8b2