diff options
| author | Raphael Moll <raphael@google.com> | 2013-05-04 00:36:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-04 00:36:42 -0700 |
| commit | 59d12ac47e2582719b747800a598ce5f3cfec374 (patch) | |
| tree | 73e22d80a3a6b2b21f9794d99490cf0265ff61a6 | |
| parent | e8c56566fe9c3a7d5df63657d0ab9a5d61e80207 (diff) | |
| parent | 01808a5b1248df3628cafafc22a343cae3fa4880 (diff) | |
| download | platform_sdk-android-4.3_r0.9.1.tar.gz platform_sdk-android-4.3_r0.9.1.tar.bz2 platform_sdk-android-4.3_r0.9.1.zip | |
am 01808a5b: resolved conflicts for merge of c5fd733f to jb-mr1-dev-plus-aospandroid-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-dev
* commit '01808a5b1248df3628cafafc22a343cae3fa4880':
Fix Windows SDK: disable emulator. DO NOT MERGE.
0 files changed, 0 insertions, 0 deletions