tree 8578e87da494a23648146b8cac097973fccdebf2
parent 270226b0dddcf3ccb9a4c13cd3dd0427ebc7a4aa
parent 40765a4a5300914e8c7ce7ed6397cec7ab8d78a1
author quddusc <quddusc@google.com> 1377802672 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377802672 -0700

am 40765a4a: am 2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7

* commit '40765a4a5300914e8c7ce7ed6397cec7ab8d78a1':
  cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7