tree be637547c725febd189f8b263693db6557ddaa7d
parent d90bbd734deeb6e6756e0015b796a8ec0f82eeef
parent 7f29e3862c61efba4c4461ab13b874e2efcfbb2e
author Fuyao Zhao <fuyaoz@google.com> 1440712792 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440712792 +0000

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':