tree 9d81f89f09193a8a8ba33a7f1da0d5333166606c
parent 2e5908f47ee5cd00d10d539d0a2fbcdf7155c740
parent 8e269845a1bbb2fa27c0db47830a8b7fbaf554f3
author Raymond Chiu <chiur@google.com> 1423506959 +0000
committer android-build-merger <android-build-merger@google.com> 1423506959 +0000

Merge "Prioritise local repository when USE_EXTERNAL_REPO is enabled." into studio-1.2-dev
automerge: 8e26984

* commit '8e269845a1bbb2fa27c0db47830a8b7fbaf554f3':
  Prioritise local repository when USE_EXTERNAL_REPO is enabled.