| commit | e497826dd81aa2b5b67d9607268976f688d704ff | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Mon Jan 26 22:09:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 26 22:09:48 2015 +0000 |
| tree | 891385cdf95b761432971b0f3e1417b97c1b7395 | |
| parent | 32d30e59243eaf96bebdde860b2ddc7b87eeb7f9 [diff] | |
| parent | 2d67a483ede93f1d3906e1d03f46af34887764ac [diff] |
am 2d67a483: am cdc38d04: Merge "Fix the v2 descriptor handling." * commit '2d67a483ede93f1d3906e1d03f46af34887764ac': Fix the v2 descriptor handling.