tree 9f68c3c5fffaee401d1fbfa836156400dfea0b3b
parent 5e90c1485a5efe55502884a9f63994914ac19fac
parent 177a5df995c66880a7060fe02f4f696421fdde1d
author quddusc <quddusc@google.com> 1383424963 -0700
committer quddusc <quddusc@google.com> 1383424963 -0700

Merge commit '177a5df9' into manualmerge2

Conflicts:
	samples/browseable/ActivityInstrumentation/_index.jd

Change-Id: I7fd9bf69af0bc1450462952f2e250d1776a0b8db