diff options
| author | Benoit Goby <benoit@android.com> | 2011-04-11 18:53:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-11 18:53:57 -0700 |
| commit | 316594715d31bb95b5efa08bfc80f287833b3a37 (patch) | |
| tree | a10e2f02ade56220f17742aa08d8f9d9b9793f80 /libs/utils | |
| parent | 07c25b651216daac884bd503c02b788418165b50 (diff) | |
| parent | 2869d1715d815ef2b357bf182d384515cdf6f9ab (diff) | |
| download | frameworks_base-316594715d31bb95b5efa08bfc80f287833b3a37.zip frameworks_base-316594715d31bb95b5efa08bfc80f287833b3a37.tar.gz frameworks_base-316594715d31bb95b5efa08bfc80f287833b3a37.tar.bz2 | |
am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE
* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
Add support for USB Ethernet adapters
Diffstat (limited to 'libs/utils')
0 files changed, 0 insertions, 0 deletions