| commit | fca540f81dd9fdb37ca7086cbd4527da9e14563a | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Fri May 06 18:36:52 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 06 18:36:52 2016 +0000 |
| tree | a727d2f144d74a78c4fd7b1723e537a4786c02cc | |
| parent | cb772c36a3befbe1a69fb6d2d8a9f7ae3b8817c2 [diff] | |
| parent | f8b50aa70bb24dbe42717484eb32618fc671aeac [diff] |
resolve merge conflicts of 8d89f40 to nyc-mr1-dev am: f8b50aa70b * commit 'f8b50aa70bb24dbe42717484eb32618fc671aeac': hal: enable 24 bit capture Change-Id: I806708bde640ada5b1831e06df271aed629c73cb