summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFuyao Zhao <fuyaoz@google.com>2015-08-27 21:59:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 21:59:52 +0000
commit72f6ad977c154181d2a252a28e03497042c94b12 (patch)
treebe637547c725febd189f8b263693db6557ddaa7d
parentd90bbd734deeb6e6756e0015b796a8ec0f82eeef (diff)
parent7f29e3862c61efba4c4461ab13b874e2efcfbb2e (diff)
downloadidea-72f6ad977c154181d2a252a28e03497042c94b12.tar.gz
am 7f29e386: am 30175677: (-s ours) am 0aade84f: am 6e7164db: Merge "Implement Gradle awared \'Add JUnit dependency\' quick fix" into studio-1.4-dev automerge: 2e6ab42 automerge: 8bd7cc6
* commit '7f29e3862c61efba4c4461ab13b874e2efcfbb2e':
0 files changed, 0 insertions, 0 deletions