summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFuyao Zhao <fuyaoz@google.com>2015-08-27 21:59:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 21:59:50 +0000
commitd90bbd734deeb6e6756e0015b796a8ec0f82eeef (patch)
treebe637547c725febd189f8b263693db6557ddaa7d
parentf7fa9aba20fe6fea407d4ca0ff81a85bd8cc3dd4 (diff)
parentfc1df542dfc4d0f3485c25c4449f3f49b2a030a5 (diff)
downloadidea-d90bbd734deeb6e6756e0015b796a8ec0f82eeef.tar.gz
am fc1df542: 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 'fc1df542dfc4d0f3485c25c4449f3f49b2a030a5':
0 files changed, 0 insertions, 0 deletions