tree 3b3c96dd5c3162dbac21d9cc3ae8f6877e683e9b
parent 27bfc86d8b426f671361012f47ed024dc0e4adf5
parent d05e19df41cadcb8e789e00f05ee10a29467d175
author Nan Zhang <nanzhang@google.com> 1504328232 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1504328232 +0000

Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor"