tree a4fcf2c1b8a663929325e27dc419038022d7a20b
parent a663ad804ca55922252203a1e98aca173ecba0f4
parent f7555b16503d760adc9206ab07d9ab3b9da1fc67
author Christopher Ferris <cferris@google.com> 1422307685 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1422307686 +0000

Merge "Fix the v2 descriptor handling."