tree 1334f195c793793d4649efe53a240358cefa7e47
parent cad5ce81adb28e131f2521fa5e553e222e0a19f4
parent 3ed8ef02ede8539dc80adc3e6cf5650a80650763
author Christopher Ferris <cferris@google.com> 1422307700 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1422307701 +0000

Merge "Fix the v2 descriptor handling."