| commit | 990ac5294477fe3f427ef0a12caba68119ce0ea3 | [log] [tgz] |
|---|---|---|
| author | Joe Onorato <joeo@android.com> | Tue Aug 31 12:19:00 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 31 12:19:00 2010 -0700 |
| tree | 42728f5d82dc4db4faa1deee6eafe4ac350f03f3 | |
| parent | 2cbe236138d1e8b003730087ee9c8e9ecca83795 [diff] | |
| parent | 18551815e5a45f236f9898ce4abc9b99f5fc6ae4 [diff] |
am 18551815: (-s ours) am 77881293: DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments. Merge commit '18551815e5a45f236f9898ce4abc9b99f5fc6ae4' * commit '18551815e5a45f236f9898ce4abc9b99f5fc6ae4': DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.