OSDN Git Service

am fb4a0e45: Merge "docs: ADK 2012 documentation with AOA protocol docs" into jb-dev
authorJoe Fernandez <joefernandez@google.com>
Tue, 26 Jun 2012 20:17:38 +0000 (13:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 26 Jun 2012 20:17:38 +0000 (13:17 -0700)
commit719ff2c4684254074ee9071ffa20aa6f684f921c
tree69e37bb262b94d2db40065daa2bb8d8667af4fb5
parent7b6698e7bee3b62ec95c1620e2be75af14a4c360
parentfb4a0e452b81794884b95daa2121a9953ade4e36
am fb4a0e45: Merge "docs: ADK 2012 documentation with AOA protocol docs" into jb-dev

* commit 'fb4a0e452b81794884b95daa2121a9953ade4e36':
  docs: ADK 2012 documentation with AOA protocol docs