summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Ruiz <alruiz@google.com>2015-08-27 21:58:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 21:58:49 +0000
commite7392cc213c96c9ad8ee1536c7857d06ad709fbd (patch)
treebe637547c725febd189f8b263693db6557ddaa7d
parentf398e4f780367c422dfc47c5ca5f81db125776d7 (diff)
parent172f80ecd6fc2800ec634d640ca7b3718f5bd4e7 (diff)
downloadidea-e7392cc213c96c9ad8ee1536c7857d06ad709fbd.tar.gz
am 172f80ec: am f0b8878c: (-s ours) am 3695d7a2: am d675d774: Merge "Removed check for writable access to Android SDK location." into studio-1.3-dev automerge: a275126 automerge: a11cd8d automerge: 67bf4e2
* commit '172f80ecd6fc2800ec634d640ca7b3718f5bd4e7':
0 files changed, 0 insertions, 0 deletions