[automerger skipped] Merge "Droiddoc can accept logtags as input sources" am:...
[automerger skipped] Merge "Droiddoc can accept logtags as input sources" am: 95515641 -s ours am: 793ab569 -s ours
am: 081eae9e -s ours
am skip reason: change_id I3fcdc751c91bd762a3fb19b74c1652be1c7ff115 with SHA1 5fbe62a7 is in history
Change-Id: If40f106408166f983e1d56578f72bae52379f268