commit | bc57651fb510d7b1a2811235f96e711b6be12a12 | [log] [tgz] |
---|---|---|
author | Leon Scroggins III <scroggo@google.com> | Fri Mar 07 18:13:29 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 07 18:13:29 2014 +0000 |
tree | 5fd028687e4c4c20fb143567dcd87dbbaa6d4f1b | |
parent | 785d764bd56b2d41216aa52ab8f6b6af9179f9c9 [diff] | |
parent | 278250dafb5ebb0f9b66c46b32e7dd1251cdb6ff [diff] |
Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev