| commit | 29441f934d5171daa18b170e66ea161830a49525 | [log] [tgz] |
|---|---|---|
| author | David Brazdil <dbrazdil@google.com> | Mon Sep 12 16:43:28 2016 +0100 |
| committer | David Brazdil <dbrazdil@google.com> | Mon Sep 12 16:58:12 2016 +0100 |
| tree | aa9efcfc4deff5019df93743cef89c42c5d6f97b | |
| parent | b1d673327d7d87a34fb003372f6a9fc3af53f33e [diff] | |
| parent | 0976590e049accf10e8cc8389f2cdb25cc2b6a6f [diff] |
resolve merge conflicts of 0976590 to nyc-mr1-dev-plus-aosp Change-Id: I67a45fd1d034f143e9605cc2576c16aea4f8dbc9