OSDN Git Service

Merge "Fix lint error, and Makefile that could be confused with local files."
authorNicolas Geoffray <ngeoffray@google.com>
Tue, 18 Mar 2014 12:00:54 +0000 (12:00 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 18 Mar 2014 12:00:55 +0000 (12:00 +0000)

Trivial merge