diff options
| author | Eric Laurent <elaurent@google.com> | 2010-07-27 02:41:41 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2010-07-27 02:41:41 -0700 |
| commit | 9e77e155b05e419a34e0fd116ee50f0fc092e67a (patch) | |
| tree | 2e1a99949a5076641ba453bf75cc5e458d2225fd /media/mtp/MtpDevice.cpp | |
| parent | a9d01c6de17ca72d67a88673d5c9ee22047c862a (diff) | |
| parent | 184f8deb44ab3b21ddaaf845f39721ba1d18ab5d (diff) | |
| download | frameworks_av-9e77e155b05e419a34e0fd116ee50f0fc092e67a.zip frameworks_av-9e77e155b05e419a34e0fd116ee50f0fc092e67a.tar.gz frameworks_av-9e77e155b05e419a34e0fd116ee50f0fc092e67a.tar.bz2 | |
resolved conflicts for merge of d306cc81 to master
Change-Id: Ib593b7719a837de12605e8c75904634843298ba1
Diffstat (limited to 'media/mtp/MtpDevice.cpp')
0 files changed, 0 insertions, 0 deletions