| commit | f084942a541232d2ff1c60631ecea96a04cbaeb0 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Mon Jan 26 22:09:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 26 22:09:41 2015 +0000 |
| tree | 55aeaa30c469e221925d4536c705376a1e6c0cf9 | |
| parent | 5c27193dd1a5986b5b9b43b7727679a59562db5e [diff] | |
| parent | d848d7038b0a09c99430a90bc2f281fbeac153b4 [diff] |
am d848d703: am fb538fb1: Merge "Fix the v2 descriptor handling." * commit 'd848d7038b0a09c99430a90bc2f281fbeac153b4': Fix the v2 descriptor handling.