tree b69c22e07b26938118e35c665b77d7f743300ffa
parent 3c40d38eadeb5ea7c0733f6a40816061db8c86f8
parent e6f171514c9c499bd0a137aff6bd8a7a79d2682a
author Nicolas Geoffray <ngeoffray@google.com> 1422285464 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1422285465 +0000

Merge "Fix build breakage after GVN change."