| commit | 719ff2c4684254074ee9071ffa20aa6f684f921c | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Tue Jun 26 13:17:38 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 26 13:17:38 2012 -0700 |
| tree | 69e37bb262b94d2db40065daa2bb8d8667af4fb5 | |
| parent | 7b6698e7bee3b62ec95c1620e2be75af14a4c360 [diff] | |
| parent | fb4a0e452b81794884b95daa2121a9953ade4e36 [diff] |
am fb4a0e45: Merge "docs: ADK 2012 documentation with AOA protocol docs" into jb-dev * commit 'fb4a0e452b81794884b95daa2121a9953ade4e36': docs: ADK 2012 documentation with AOA protocol docs