tree 0cd6b5a7264423c0f4408b8bbadcb15420eac526
parent f739e3125e4724caed55939a3a00980b42c92326
parent 0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb
author Joe Onorato <joeo@android.com> 1283281937 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283281937 -0700

am 0ee89a72: DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.

Merge commit '0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb' into gingerbread-plus-aosp

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