tree 500b46f5c1c7d34ad94ba1a0f0766aefd0a81197
parent 65ea51501c13055a2e3d96017721b8ba1b90f9b6
parent 51afc022fa76c79f0d1ece470ddc126c08fea8a4
author Romain Guy <romainguy@android.com> 1241485461 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1241485461 -0700

am 51afc02: Fix obsolete javadoc

Merge commit '51afc022fa76c79f0d1ece470ddc126c08fea8a4'

* commit '51afc022fa76c79f0d1ece470ddc126c08fea8a4':
  Fix obsolete javadoc