[automerger skipped] Merge "Cut the dependency to framework from droiddoc modules" am: a067de365a -s ours am: f575ac0667 -s ours
am:a7858a84f5-s ours am skip reason: change_id I09ad88da47540d31ad089aad5e1151a4b6877ec2 with SHA15366ea2089is in history Change-Id: I084bbb6f76264a2fe16657aed578406f5a0b9729
This commit is contained in: