| commit | 997814263d19611884d9c48f2a22d632bb74909c | [log] [tgz] |
|---|---|---|
| author | Chenbo Feng <fengc@google.com> | Thu Jul 13 18:33:11 2017 -0700 |
| committer | Chenbo Feng <fengc@google.com> | Mon Jul 17 20:44:39 2017 +0000 |
| tree | 484224054b722349cf223323dea0bc7645a6bbd3 | |
| parent | d69455289f21d7645ba0a7bc1cb959ae5f82f74f [diff] | |
| parent | ba65ffc4623240b38f8d2c940195a8bbdeb8e6a2 [diff] |
Resolve merge conflicts of 8482d8c85c to nougat-cts-dev
Test: I solemnly swear I tested this conflict resolution.
in cts-tf: run cts --module CtsNativeNetTestCases
Change-Id: I15253841993a79320dafa8669f0289c28f4ff4ea