| commit | 93d6c5e399b042ca2b527eb3727208d04de2d853 | [log] [tgz] |
|---|---|---|
| author | Joe Onorato <joeo@google.com> | Thu Sep 16 10:56:14 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 16 10:56:14 2010 -0700 |
| tree | ce9a4197ae4a4ae8a43c0e26d2b8d0a41c86bf3b | |
| parent | 0e309d0b05b73407c5da08aa4b1a00a63f27fd3e [diff] | |
| parent | d2ca897f68e21b3381c933c728078fb62c517eed [diff] |
am d35186ce: (-s ours) am 7747795a: Merge "These are not javadoc tags, they are annotations in sample code. Escape them properly." into gingerbread Merge commit 'd35186ce1882b79db5aeaea7a5a6fdf4be89bcb8' * commit 'd35186ce1882b79db5aeaea7a5a6fdf4be89bcb8': These are not javadoc tags, they are annotations in sample code. Escape them properly.