| commit | fb4a0e452b81794884b95daa2121a9953ade4e36 | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Tue Jun 26 13:15:26 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 26 13:15:26 2012 -0700 |
| tree | b61dcacf2e13c3c0430f7a918039fb15f5ac61f9 | |
| parent | 3c6f8e4da0abc47b0d52e47edefa694bd81b8042 [diff] | |
| parent | 3a77ccc63f11b26067f03ef61a713ff2599fbb5f [diff] |
Merge "docs: ADK 2012 documentation with AOA protocol docs" into jb-dev