Commit 59d12ac4 authored by Raphael Moll's avatar Raphael Moll Committed by Android Git Automerger
Browse files

am 01808a5b: resolved conflicts for merge of c5fd733f to jb-mr1-dev-plus-aosp 

* commit '01808a5b':
  Fix Windows SDK: disable emulator. DO NOT MERGE.
parents e8c56566 01808a5b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment