| commit | 5734b2f40e6a4487efded994a82fb5a6fd3680a0 | [log] [tgz] |
|---|---|---|
| author | Alex Vakulenko <avakulenko@google.com> | Tue Nov 24 10:38:18 2015 -0800 |
| committer | Alex Vakulenko <avakulenko@google.com> | Tue Nov 24 10:38:18 2015 -0800 |
| tree | 4fe7251a205084549891c75f158cb70813c20a1b | |
| parent | 4bbb8ff94abf5db26396db9fac5c1df2c998a54a [diff] | |
| parent | 7d66921b44464e4480d86c362294831f9587a061 [diff] |
Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'