| commit | dbc7a4653f2a50863788bef0c3ac67acc35fc5ab | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Fri Mar 07 18:25:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 07 18:25:32 2014 +0000 |
| tree | 024c817926f26dbcbd69c48fa81e1606a259fc42 | |
| parent | 38d12b07e7483764749359a6f5aaebbf13d99f39 [diff] | |
| parent | 757ab3e6df3f884b7ea36ae021c886513a2ce2ca [diff] |
am 757ab3e6: am 48df72f7: am 74ca3fd3: (-s ours) am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev * commit '757ab3e6df3f884b7ea36ae021c886513a2ce2ca': DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516