Merge commit '3943cdc9' into manualmerge2

Browse Source

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

Change-Id: Ia9a333bd09d2e7e9417a560581c40bd02d295c12

...

This commit is contained in:

quddusc

2013-11-01 19:17:20 -07:00

parent f99585bddd 3943cdc962

commit 60737e9507

2 changed files with 5 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files