summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2015-08-27 21:58:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 21:58:30 +0000
commita6ade21500aed99848e9a1b5bc4f7f087e07e091 (patch)
treebe637547c725febd189f8b263693db6557ddaa7d
parentee8c4bc77a5119ee61f8211a6481a0227655f76f (diff)
parentd6c5882c065b43e1dc4dd9109bb29bba59a127a1 (diff)
downloadidea-a6ade21500aed99848e9a1b5bc4f7f087e07e091.tar.gz
am d6c5882c: am 22fc4c72: (-s ours) am a3605d1d: am ebcc08ec: Merge "Fixing error when haxm installer doesn\'t return revision" into studio-1.3-dev automerge: 007dfca automerge: 27ba2e0 automerge: e4cadeb
* commit 'd6c5882c065b43e1dc4dd9109bb29bba59a127a1':
0 files changed, 0 insertions, 0 deletions