tree ff5677c6943d760de5fb647184be89070bef318f
parent f6e429531620688fa00bfae0cda4ec04d9c7d4ec
parent 3d33c68f9e0ddc3b022e027e7644e908cfc9725e
author Jeff Sharkey <jsharkey@android.com> 1334204101 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1334204101 -0700

am 3d33c68f: am d9818244: Merge "DO NOT MERGE: Make component names visible in javadoc." into ics-mr1

* commit '3d33c68f9e0ddc3b022e027e7644e908cfc9725e':