tree 6b728cdcc7147082d03a460180106176ad7ac312
parent 02650001988801f874b9bcea46efab1303b902b1
parent 0a8ab9973e1fdf6b41d8f7b49529c9bd97a9071c
author Vitaly Buka <vitalybuka@google.com> 1452630124 -0800
committer Vitaly Buka <vitalybuka@google.com> 1452630124 -0800

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

0a8ab99 Don't allow registration of registered device