Commit 2846db43 authored by Raphael Moll's avatar Raphael Moll Committed by Android Git Automerger
Browse files

am 07f6904f: resolved conflicts for merge of 80f171f8 to jb-mr1-dev-plus-aosp 

* commit '07f6904f':
  SDK: disable emulator. DO NOT MERGE.
parents 5c0a8a6e 07f6904f
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