| commit | 8cee1fdc2542e5146c9b3d375819e87daeb4d1aa | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Mon Mar 17 15:58:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 17 15:58:36 2014 +0000 |
| tree | be45fc65c13fba231914439c995359cf45c29a73 | |
| parent | 7e6fe28b12bf936cc8c5c5f689a6aef6b7f21625 [diff] | |
| parent | f096ed68e1ee5810f436ca820c1eada4b1a182a5 [diff] |
am f096ed68: am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516 * commit 'f096ed68e1ee5810f436ca820c1eada4b1a182a5': DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516