tree bc122915bcb2d7c8cfd94ba93b4021473dec5297
parent 2339fe3f8f89d6254ce05a1b4e9587f0257e8316
parent 8e94d912c6e0fc3c6d5e992b6559a0efc20372be
author Joe Malin <jmalin@google.com> 1323724536 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323724536 -0800

am 8e94d912: am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0

* commit '8e94d912c6e0fc3c6d5e992b6559a0efc20372be':
  DOC CHANGE: Package text and Formatter javadoc