| commit | 8caff64f85fde82602e0e452003bcb488985695d | [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 | 380bbbb1666ddbc975f210f8d47912363440eed0 | |
| parent | 8e1d70f79b51a614522b9e434ba104d3f645c655 [diff] | |
| parent | 90d29183a40a61a4df8994dd657ffee31e444f07 [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.