| commit | 33fd08359639d41c31e00af19ab211cd0423f96c | [log] [tgz] |
|---|---|---|
| author | Peng Xu <pengxu@google.com> | Mon Sep 25 15:38:00 2017 -0700 |
| committer | Peng Xu <pengxu@google.com> | Mon Sep 25 15:38:18 2017 -0700 |
| tree | 96d6cfe60cb2cb2ef4c493189d473e18a95ff0ed | |
| parent | 27bf3239faabf592654a95bcc26d3c8f29447e56 [diff] | |
| parent | 15b43e96a3c8c0ffea488e9b29056f0cf3c56477 [diff] |
resolve merge conflicts of 15b43e96 to stage-aosp-master Test: multihal compiles Change-Id: I744793517b150f65c702a846f47c067b2f01f8a3