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)
Merge commit '0f9a91c94fa9f3b0082744efe2457528ef19fa62'

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


Trivial merge