summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2015-08-27 21:59:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 21:59:25 +0000
commitaa530d8392f2a95f1519c8b55d9d075c51a44ec9 (patch)
treebe637547c725febd189f8b263693db6557ddaa7d
parent5385d204948151f3e519c9c2acde2161198002f6 (diff)
parentf561bda02daceb78b5feb8a5701ac9d6d63f13c9 (diff)
downloadidea-aa530d8392f2a95f1519c8b55d9d075c51a44ec9.tar.gz
am f561bda0: am 461c1bb7: (-s ours) am 145db7b4: am 8dd34fa8: Merge "Fixing creation of wear AVDs on windows" into studio-1.3-dev automerge: 240238f automerge: d0aa6f6 automerge: 118d8d5
* commit 'f561bda02daceb78b5feb8a5701ac9d6d63f13c9':
0 files changed, 0 insertions, 0 deletions