| commit | 7678a4bdf32e1017adfb21b03e07e927f5d296fd | [log] [tgz] |
|---|---|---|
| author | Tim Kilbourn <tkilbourn@google.com> | Fri Jun 05 00:47:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 05 00:47:28 2015 +0000 |
| tree | 7ae6883c85b421342ecdfbaccf8f76254ded9a58 | |
| parent | 60cc48ca80e51bb4c8b9e9bf97d6f82a6d2054d9 [diff] | |
| parent | c280ddca709cef53852600404919b757404f568e [diff] |
am c280ddca: (-s ours) am 9e6d2ee0: DO NOT MERGE Remove unused ParcelFileDescriptor methods in parcel. * commit 'c280ddca709cef53852600404919b757404f568e': DO NOT MERGE Remove unused ParcelFileDescriptor methods in parcel.