tree af39f7ca1334b27387c761ab5a6b8e4235df1a2b
parent 7cf9bc124ff38b083c1d2e8493225c9ba1814874
parent b6e06d57e5ed693683fc0dfb714a764829037163
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.