tree 3a3e8b93d010e337d289c228cd6109a2ba412d93
parent 2d3d72ac1c0ef81ca91dc49261ca6b0b45590849
parent 1fb9730c03c32b02539a5e88a6d1cfaaf7aa0695
author Joe Onorato <joeo@google.com> 1284148155 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284148155 -0700

am 81fe092d: Merge "Make @deprecated without a comment an error DO NOT MERGE" into gingerbread

Merge commit '81fe092d11607912944a49c47df6c14e28a977b8' into gingerbread-plus-aosp

* commit '81fe092d11607912944a49c47df6c14e28a977b8':
  Make @deprecated without a comment an error DO NOT MERGE