tree 70a5f6b3677e0891c7f3d008ecde2f805772cba6
parent 4bffe7598e2770ebf8265b2e01fa633830c916b1
parent c52dd6072e936aac0773572713b48e788a26b829
author Joe Baker-Malone <jbakermalone@google.com> 1436204009 +0000
committer android-build-merger <android-build-merger@google.com> 1436204009 +0000

Merge "Making SDK path editing in SDK manager actually work" into studio-1.4-dev
automerge: c52dd60

* commit 'c52dd6072e936aac0773572713b48e788a26b829':
  Making SDK path editing in SDK manager actually work