commit | 0c17d01a9b6236c80a00214c60b763d8cbe76dff | [log] [tgz] |
---|---|---|
author | Scott Main <smain@google.com> | Tue May 18 09:07:39 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 18 09:07:39 2010 -0700 |
tree | 6993687d0c39d4fe3303d40166c0ad7450e9e969 | |
parent | 2e33500e61acfecc292de7e77e5dfeb6b23e3ad2 [diff] | |
parent | e16cbc55b1ddf94743f1191a2cbec449917f4dc4 [diff] |
am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo Merge commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca' into kraken * commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca': docs: fix markup error