summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFuyao Zhao <fuyaoz@google.com>2015-08-27 11:15:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 11:15:55 +0000
commitfc1df542dfc4d0f3485c25c4449f3f49b2a030a5 (patch)
treebe637547c725febd189f8b263693db6557ddaa7d
parent8c531bc2fdf65c63acb1bd7f78eef248ec24d9e8 (diff)
parent96b9118ceb1f4db26833b41b472e151c542a02de (diff)
downloadidea-fc1df542dfc4d0f3485c25c4449f3f49b2a030a5.tar.gz
am 96b9118c: (-s ours) am 5897882a: am bcc4efa6: Merge "Add module dep quickfix will correctly consider the type of module. Don\'t generate source when doing gradle sync." into studio-1.4-dev automerge: f460715 automerge: 63815e7
* commit '96b9118ceb1f4db26833b41b472e151c542a02de':
0 files changed, 0 insertions, 0 deletions