| commit | d80f095efb1cb1751fa72e9344b8b5e276b6db6f | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Tue Jun 26 13:19:56 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 26 13:19:56 2012 -0700 |
| tree | aef94bccf61fab92b8d2dc959e43ab32cfccb907 | |
| parent | c3bc9efee4e81e0ebcbab0672ebe4c6def1a81a9 [diff] | |
| parent | 719ff2c4684254074ee9071ffa20aa6f684f921c [diff] |
am 719ff2c4: am fb4a0e45: Merge "docs: ADK 2012 documentation with AOA protocol docs" into jb-dev * commit '719ff2c4684254074ee9071ffa20aa6f684f921c': docs: ADK 2012 documentation with AOA protocol docs