diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-01 09:12:31 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-01 09:12:31 -0800 |
| commit | 91dceb8143c9dab6b9b0ad38b5a3d7bb0586c677 (patch) | |
| tree | cc85d2f589b4d83f9fbb06559bef035c38641ad6 /docs/html/sdk/api_diff/11/changes | |
| parent | 8697f397e29cdfb90f84fab584eff9edc2b0dc6f (diff) | |
| parent | 54e96c69d068593f1d5893be6067509b07abdadc (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:
Diffstat (limited to 'docs/html/sdk/api_diff/11/changes')
0 files changed, 0 insertions, 0 deletions
