summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Nuno <juancnuno@google.com>2015-08-27 21:55:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 21:55:28 +0000
commit6ca2063867db53af4de9dc8a4ecd7bda700e21de (patch)
treebe637547c725febd189f8b263693db6557ddaa7d
parent009aee7c02ee54a23a39a7b02380f729a1a66d1d (diff)
parent1a2ba70b1c8136495a532213a52a0c6af218cdc6 (diff)
downloadidea-6ca2063867db53af4de9dc8a4ecd7bda700e21de.tar.gz
am 1a2ba70b: am fdcc7774: (-s ours) am b6323440: am d6f38fde: Merge "Stubbed getTestInstrumentationRunnerArguments" into studio-1.4-dev automerge: 2af47f0 automerge: b7a4651
* commit '1a2ba70b1c8136495a532213a52a0c6af218cdc6':
0 files changed, 0 insertions, 0 deletions