tree 678044441d5f8802a7e59aa47d3b9905abfb7bbb
parent 4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b
parent b01e10c5bc0a29d1b0da96783b6d1582baeb2af2
author Joe Onorato <joeo@google.com> 1284674450 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284674450 -0700

am b01e10c5: There is no @note javadoc tag.

Merge commit 'b01e10c5bc0a29d1b0da96783b6d1582baeb2af2' into gingerbread-plus-aosp

* commit 'b01e10c5bc0a29d1b0da96783b6d1582baeb2af2':
  There is no @note javadoc tag.