tree 12151d7c28733789ca9f399590bd1026fb577e29
parent 4ac92501b4aef0bf142904d06e97ca2d3ca5aa0f
parent 0525db8734f363df2b57dee2bc8fc49535d2bf07
author Justin Ho <justinho@google.com> 1329520809 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329520809 -0800

am 0525db87: am 1e617607: Merge "Fix support for USB ethernet adapters on Xoom" into ics-mr1

* commit '0525db8734f363df2b57dee2bc8fc49535d2bf07':