tree 9678ecc0ee37f2ad493e47dbe9589965aef15e88
parent f6659ebf9ab2435948d43279c54c56171fc04131
parent ef4257b59c4307b8c627d89f3c7f1feedb32582f
author Steve Muckle <smuckle@google.com> 1488491358 -0800
committer Steve Muckle <smuckle@google.com> 1488491358 -0800

Merge remote-tracking branch 'aosp/upstream-master' into HEAD

Initial merge of kmod v24.