tree c8026c0e9a853b7e889f8faf399f80dbd28af411
parent 0df45b0898710a2e7ddd723fae450ad701a4614d
parent cb733bc564d974cfd3fe08be1d0e5c06cd85911f
author Ying Wang <wangying@android.com> 1396909878 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396909878 +0000

am cb733bc5: Merge "Fix droiddoc generation."

* commit 'cb733bc564d974cfd3fe08be1d0e5c06cd85911f':
  Fix droiddoc generation.