diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-09-27 20:50:22 -0700 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2010-09-27 20:50:22 -0700 |
| commit | b36f2df1daf7e733be7c51f93792f8fc4252544c (patch) | |
| tree | 67cc64d0fd46312a304aafd24cdd1167d793c919 /media/mtp | |
| parent | 214a2bdcf6f8f26a0218f2d7a8d822c7b3a71d03 (diff) | |
| parent | 2c423a4dc0988e3195c781d56f119514789b604b (diff) | |
| download | frameworks_av-b36f2df1daf7e733be7c51f93792f8fc4252544c.zip frameworks_av-b36f2df1daf7e733be7c51f93792f8fc4252544c.tar.gz frameworks_av-b36f2df1daf7e733be7c51f93792f8fc4252544c.tar.bz2 | |
resolved conflicts for merge of 191a25e1 to master
Change-Id: I6f4940e337a992bf84e50bc1d22432593937499c
Diffstat (limited to 'media/mtp')
0 files changed, 0 insertions, 0 deletions