OSDN Git Service

cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
authorRobert Ly <robertly@google.com>
Tue, 14 Jun 2011 18:50:19 +0000 (11:50 -0700)
committerRobert Ly <robertly@google.com>
Tue, 14 Jun 2011 18:50:19 +0000 (11:50 -0700)
commitf25be17f6413417aa6a1e3a5a791302099d15008
tree2e1ca75f88404e2e95bb62c73c37d90cff124f68
parent700a1f25719138b94c453beb6325e627a11a9883
cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7

Conflicts:

docs/html/guide/topics/usb/adk.jd

Change-Id: I09b7fafd5d946a9e0d42c025089bdab717c8ca3e
docs/html/guide/topics/usb/adk.jd