tree 9f68c3c5fffaee401d1fbfa836156400dfea0b3b
parent f99585bddd07da98a018e70e29bad55e2204e6ea
parent 3943cdc9626911fe2732fedd5c85e920c6078a9f
author quddusc <quddusc@google.com> 1383358640 -0700
committer quddusc <quddusc@google.com> 1383358640 -0700

Merge commit '3943cdc9' into manualmerge2

Conflicts:
	samples/browseable/ActivityInstrumentation/_index.jd
	samples/browseable/TextLinkify/_index.jd

Change-Id: Ia9a333bd09d2e7e9417a560581c40bd02d295c12