tree 64909044bbda697bfd6454f71e77f0cef7ccb07b
parent 980eb2e9faedaf399411f6834cd63042dbf7fae3
parent 8af861bbf1b89982622c655b10ab5e3eb4b2fc85
author Yaowu Xu <yaowu@google.com> 1478034438 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1478034438 +0000

Merge "Fix merge issues related  --enable-ec-adapt" into nextgenv2