Merge commit '743b376b363f85b6109828e5c33857316d263468'
* commit '743b376b363f85b6109828e5c33857316d263468':
Fix SDK build break caused by including legacy support header into main API header
usb_windows.c doesn't build with adb_legacy_api.h included into adb_api.h
Since adb_legacy_api.h is not used anywhere outside AdbWinApi.dll project, the simplest
fix would be to remove its inclusion from adb_api.h
Merge commit 'd43d18015e1a9992bfe746016a1f8be2f3bd904f'
* commit 'd43d18015e1a9992bfe746016a1f8be2f3bd904f':
New ntro image for camera.html that shows flow for video capture.
Merge commit '84c6ef89468a8753dfb4b87f203c800c199c7bd0'
* commit '84c6ef89468a8753dfb4b87f203c800c199c7bd0':
Refactor API classes to support both, WinUsb and Legacy API
To support both, WinUsb and Legacy driver APIs we need to abstract classes
that depend on driver API details and then implement two sets of the
actual classes: one for WinUsb, and another for the Legacy drivers, so
we can choose in runtime which objects should be instantiated, depending
on what type of driver we have underneath this API.
Merge commit '1ff4f596bfe608b26656f1e854f1a5504877bdaa'
* commit '1ff4f596bfe608b26656f1e854f1a5504877bdaa':
Rename ndk/build/platforms/android-1.5 into android-3 to match API levels
Merge commit 'e8c0bd070c2d7d3987f188b520b36cbdfa22399b'
* commit 'e8c0bd070c2d7d3987f188b520b36cbdfa22399b':
Handle LOCAL_CPPFLAGS/CFLAGS/CXXFLAGS as claimed by the documentation.
HVGA-P and HVGA-L were redundant with HVGA which supports both orientations.
QVGA-P and QVGA-L has been replaced with QVGA which supports both orientations.
Merge commit '84c9d60322e4605d2d96eb8b058e21125f2ad7fe'
* commit '84c9d60322e4605d2d96eb8b058e21125f2ad7fe':
Script to strip out unused translations when you change the base strings.xml.
Default location of the symbols is $ANDROID_PRODUCT_OUT/symbols.
Setting the env variable ANDROID_SYMBOLS allows you to override this location
so that DDMS goes look for the symbol in a different location when
resolving native heap addresses.
Merge commit 'f74c1d2fb76ed6f3a08c76f3c4dc7c783c39383c'
* commit 'f74c1d2fb76ed6f3a08c76f3c4dc7c783c39383c':
Add default version files into the SDK for docs/tools/platforms.
Merge commit 'e5bfd50ece683b42c0053995d149dc096c80a312'
* commit 'e5bfd50ece683b42c0053995d149dc096c80a312':
Also filter the list of Archives to only show the compatible ones.
Merge commit 'ba29296c080103aa945f83e795c97bd45ed06b3e'
* commit 'ba29296c080103aa945f83e795c97bd45ed06b3e':
Add a checkbox to only show packages that are updates or new.
Merge commit 'ecc85daf7b9676c8e94f1f295345c8f385de45d4'
* commit 'ecc85daf7b9676c8e94f1f295345c8f385de45d4':
Fix loading of user repository and add refresh when adding/removing.
