summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Baker-Malone <jbakermalone@google.com>2015-08-27 21:58:04 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 21:58:04 +0000
commitac4d1571bc92a6a2e1f33377c364987c65eb9849 (patch)
treebe637547c725febd189f8b263693db6557ddaa7d
parent09c34c8ce42850a8dd24091cf8016a05d6ee4136 (diff)
parent148301481698ca835f3a2674f42dda4ea4654910 (diff)
downloadidea-ac4d1571bc92a6a2e1f33377c364987c65eb9849.tar.gz
am 14830148: 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 '148301481698ca835f3a2674f42dda4ea4654910':
0 files changed, 0 insertions, 0 deletions