diff options
| author | Raphael Moll <raphael@google.com> | 2013-05-03 15:42:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-03 15:42:27 -0700 |
| commit | 2846db43ba3a43c86e5f18be7f914a7556809609 (patch) | |
| tree | 6d2c442c872b0fd036dfc9fcffa7d966cb56169a /eclipse | |
| parent | 5c0a8a6ec899ea9f4fd0020237e61455f6cf98e7 (diff) | |
| parent | 07f6904f97f1b5de82a7c76ef828fde65559706b (diff) | |
| download | sdk-2846db43ba3a43c86e5f18be7f914a7556809609.zip sdk-2846db43ba3a43c86e5f18be7f914a7556809609.tar.gz sdk-2846db43ba3a43c86e5f18be7f914a7556809609.tar.bz2 | |
am 07f6904f: resolved conflicts for merge of 80f171f8 to jb-mr1-dev-plus-aosp
* commit '07f6904f97f1b5de82a7c76ef828fde65559706b':
SDK: disable emulator. DO NOT MERGE.
Diffstat (limited to 'eclipse')
0 files changed, 0 insertions, 0 deletions