| commit | aefa80254fa09f0040ba19c27e1752756c2081e1 | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Mon Feb 22 07:16:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Feb 22 07:16:01 2016 +0000 |
| tree | 0f72b75fd3317bf2f9d8397cc2974bbba72669be | |
| parent | 3697ed1fcd441f712f19a291a99a9533558bad92 [diff] | |
| parent | 0f6ae2ec0df270c4ce51c87896fe01fe6e1fedfa [diff] |
resolve merge conflicts of b242549166 to nyc-dev am: 0f6ae2ec0d * commit '0f6ae2ec0df270c4ce51c87896fe01fe6e1fedfa': Give bluetooth sufficient capabilities to run DhcpClient