summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Baker-Malone <jbakermalone@google.com>2015-08-27 11:14:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 11:14:49 +0000
commit148301481698ca835f3a2674f42dda4ea4654910 (patch)
treebe637547c725febd189f8b263693db6557ddaa7d
parent70359d4c41621d2aeb547e18b0d75d98d1c103b4 (diff)
parent9ac45b8b21fcdfbc8fa279f4f3f0fe92b764000a (diff)
downloadidea-148301481698ca835f3a2674f42dda4ea4654910.tar.gz
am 9ac45b8b: (-s ours) am 5281e150: am 4cbe9fa1: Merge "Semi-fixing GTK+ issue in sdk manager" into studio-1.4-dev automerge: a0d7421 automerge: 98b412c
* commit '9ac45b8b21fcdfbc8fa279f4f3f0fe92b764000a':
0 files changed, 0 insertions, 0 deletions