OSDN Git Service

am 0f9a91c9: (-s ours) am 0ee89a72: DO NOT MERGE - Back port change from master that...
authorJoe Onorato <joeo@android.com>
Tue, 31 Aug 2010 19:16:51 +0000 (12:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 31 Aug 2010 19:16:51 +0000 (12:16 -0700)
commitf161663814f4c372a8fa815dc787f18b09c66938
tree7eae9db3a5019f19e9d94cd84cd6b1a611f4f153
parent36aa8c3798193a7f9eb8db3ab7d4c48c786ddf76
parent0f9a91c94fa9f3b0082744efe2457528ef19fa62
am 0f9a91c9: (-s ours) am 0ee89a72: DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.

Merge commit '0f9a91c94fa9f3b0082744efe2457528ef19fa62'

* commit '0f9a91c94fa9f3b0082744efe2457528ef19fa62':
  DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.