tree 99b9650ab18d4f47becb2675510fc493c5833d1b
parent 25adf474775acb3eea260cb0a6251cf43ff798ce
parent 13299a33e14562a5de14c89ad058d28ab0cd9f37
author Dianne Hackborn <hackbod@google.com> 1323915689 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323915689 -0800

am 13299a33: am 399f1df3: Merge "Fix some java docs." into ics-mr1

* commit '13299a33e14562a5de14c89ad058d28ab0cd9f37':
  Fix some java docs.