| commit | b67b237853c31ca5262a30e6b3d8e77d7a36a130 | [log] [tgz] |
|---|---|---|
| author | Chenbo Feng <fengc@google.com> | Mon Jul 17 15:43:49 2017 -0700 |
| committer | Chenbo Feng <fengc@google.com> | Mon Jul 17 21:54:20 2017 -0700 |
| tree | 7a043a38dfbb7e72e1a24aa996188f2a5bbba1bd | |
| parent | 73a81b18cde00ed8707957a2606da3c64d5c66bf [diff] | |
| parent | a75b9016f1d6ebf3a13f25b0b2226deefbad7984 [diff] |
resolve merge conflicts of 921e4b7e1c to oc-dev
Test: I solemnly swear I tested this conflict resolution.
run cts --module CtsNativeTestCases
Change-Id: I4c8764a00d30ab7ff94eff07870ec79c7d7bc67d