diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-01-30 12:54:18 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-30 12:54:18 -0800 |
| commit | 1331f07d4400a25b9c8d2d4a1a913150ae05c5f7 (patch) | |
| tree | 2e8a393fe19a343c8aa470ae33f5cc0f64dc44ad /media/mtp | |
| parent | 6ce1c4e6f6c96cee1d799d774e803d048d808834 (diff) | |
| parent | ed5ba112bc2229c68916ada8eb0d783ba66df9e1 (diff) | |
| download | frameworks_av-1331f07d4400a25b9c8d2d4a1a913150ae05c5f7.zip frameworks_av-1331f07d4400a25b9c8d2d4a1a913150ae05c5f7.tar.gz frameworks_av-1331f07d4400a25b9c8d2d4a1a913150ae05c5f7.tar.bz2 | |
am 5f773b9f: Reconcile gingerbread-plus-aosp and honeycomb
* commit '5f773b9f72367ed8046df257d20881fd96f86929':
resolved conflicts for merge of a314f32b to honeycomb-merge
Diffstat (limited to 'media/mtp')
0 files changed, 0 insertions, 0 deletions