| commit | 59d12ac47e2582719b747800a598ce5f3cfec374 | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Sat May 04 00:36:42 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat May 04 00:36:42 2013 -0700 |
| tree | 73e22d80a3a6b2b21f9794d99490cf0265ff61a6 | |
| parent | e8c56566fe9c3a7d5df63657d0ab9a5d61e80207 [diff] | |
| parent | 01808a5b1248df3628cafafc22a343cae3fa4880 [diff] |
am 01808a5b: resolved conflicts for merge of c5fd733f to jb-mr1-dev-plus-aosp * commit '01808a5b1248df3628cafafc22a343cae3fa4880': Fix Windows SDK: disable emulator. DO NOT MERGE.