| commit | 946bb3cef9137cb12e2200cd286713aa1d74fb48 | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Mon Mar 17 16:02:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 17 16:02:29 2014 +0000 |
| tree | fdf40fe75f138794e82874440aa7bf66e15cb30a | |
| parent | 48c41b3d33968c8ffe0aa3db70ce4e0dd36df1cc [diff] | |
| parent | 8cee1fdc2542e5146c9b3d375819e87daeb4d1aa [diff] |
am 8cee1fdc: (-s ours) am f096ed68: am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516 * commit '8cee1fdc2542e5146c9b3d375819e87daeb4d1aa': DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516