tree 3d7a6ea3e640e88684325b18b52731badb53d295
parent acf08e370ed80341a29a8007ebfa6268fb2d270b
parent 62f83874a49f4a47d02e93b1439934b1fa66f7ef
author Rohit Mungee <rohitm@google.com> 1282716928 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282716928 -0700

am 22518947: am bfc9325f: Merge "Add support for generated documentation as part of the SDK docs." into gingerbread

Merge commit '2251894743f9e7b1ca7f546369c2ba7fc3d28e1f'

* commit '2251894743f9e7b1ca7f546369c2ba7fc3d28e1f':
  Add support for generated documentation as part of the SDK docs.