commit | 2d67a483ede93f1d3906e1d03f46af34887764ac | [log] [tgz] |
---|---|---|
author | Christopher Ferris <cferris@google.com> | Mon Jan 26 21:45:16 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 26 21:45:16 2015 +0000 |
tree | 3960c40a7c0088726883f3eab367d434d2ad01b8 | |
parent | efa16af53ebc3ef4974ff791d0f03ec66b20a5e8 [diff] | |
parent | cdc38d0401f2798bb13e73d6ca290abab60fc2bf [diff] |
am cdc38d04: Merge "Fix the v2 descriptor handling." * commit 'cdc38d0401f2798bb13e73d6ca290abab60fc2bf': Fix the v2 descriptor handling.