| commit | 5eea60a0ef9dd6bea7a4554ac67b52d333e3ef46 | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Fri Mar 07 18:31:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 07 18:31:39 2014 +0000 |
| tree | 6a844f97dc6ea9513160108762f880de011b2ab4 | |
| parent | 731ef298318297c2df2e1f23901cb50d6d4bc985 [diff] | |
| parent | 74ca3fd34dac9674f61313594e2863ffecd79c7a [diff] |
am 74ca3fd3: am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev * commit '74ca3fd34dac9674f61313594e2863ffecd79c7a': DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516