Commit fd294a76 authored by Raphael's avatar Raphael Committed by Android Git Automerger
Browse files

am f4b26ea7: resolved conflicts for merge of b0b2a75d to gingerbread-plus-aosp 

Merge commit 'f4b26ea7'

* commit 'f4b26ea7':
  SDK: fix dx shell script to look for dx.jar in platform-tools
parents d5854946 f4b26ea7
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