diff options
| author | David Herman <davidherman@google.com> | 2014-11-14 03:39:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-14 03:39:40 +0000 |
| commit | f87f73f11e50e3669519201b15af5f30bfebc036 (patch) | |
| tree | 56939da457a96982d088004045c7df942cc162b6 /emulator | |
| parent | 284b9a514ec33806ae0e41f21714d3bdab9366c1 (diff) | |
| parent | 3e5c7f75410804bad5497e20e307c78b47a3c16a (diff) | |
| download | sdk-f87f73f11e50e3669519201b15af5f30bfebc036.tar.gz sdk-f87f73f11e50e3669519201b15af5f30bfebc036.tar.bz2 sdk-f87f73f11e50e3669519201b15af5f30bfebc036.zip | |
Merge "Modifed find_java.bat and build settings" into studio-1.0-dev
automerge: 3e5c7f7
* commit '3e5c7f75410804bad5497e20e307c78b47a3c16a':
Modifed find_java.bat and build settings
Diffstat (limited to 'emulator')
0 files changed, 0 insertions, 0 deletions