commit | dd4af71b9801f145f6a4f0498dbcc0c2844cd430 | [log] [tgz] |
---|---|---|
author | Mike Lockwood <lockwood@android.com> | Tue Mar 01 09:12:31 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 01 09:12:31 2011 -0800 |
tree | bd73574526a2a13b96e0b8b595d33a90a6ecc804 | |
parent | 879ff09c2ae5d09034a05178b00612caa3bfcc10 [diff] | |
parent | faaee3b41925c726907069fa2818c7784ac75bb4 [diff] |
am 54e96c69: (-s ours) am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread * commit '54e96c69d068593f1d5893be6067509b07abdadc': DO NOT MERGE UsbManager: squashed commit of: