[automerger skipped] Merge "Droiddoc can accept logtags as input sources" into stage-aosp-master am: c42742c9 am: 4bd02abd am: 3f27bcdf
am: d366bf46 -s ours
am skip reason: change_id I3fcdc751c91bd762a3fb19b74c1652be1c7ff115 with SHA1 d734c790 is in history

Change-Id: Ib8fa423623b735d8b3ddf60bec3e455fbd8b1757