Merge commit '60a735fda1f9d7c24c577853304d486b0109632f'
* commit '60a735fda1f9d7c24c577853304d486b0109632f':
ADT: fix PreCompilerBuilder to use minSdkVersion as a string, not an int.
Merge commit '5379e0981ebd570faba0dcd13c087f71d856e0f0'
* commit '5379e0981ebd570faba0dcd13c087f71d856e0f0':
Remove section about USB driver as not everything is directly available anymore
Merge commit '17851887c25d198ec913196df7b851d335614ec9'
* commit '17851887c25d198ec913196df7b851d335614ec9':
Bump up AdbWinApi.dll version and submit prebuilt AdbWinApi.dll
Merge commit 'bf281a9adef5a7ef342d0e5fb240d719575e5718'
* commit 'bf281a9adef5a7ef342d0e5fb240d719575e5718':
Make changes to enable driver build in new location
Merge commit 'f8a2fbab9094d5525179770e00042ac2f85be991'
* commit 'f8a2fbab9094d5525179770e00042ac2f85be991':
Adds call back to the SDK updater for SDK content notifications.
Merge commit '1db55021599137f7bcec830d298f6062b495cd35'
* commit '1db55021599137f7bcec830d298f6062b495cd35':
Copy legacy driver source code as a sample for custom USB drivers
Merge commit 'eee1675aa40d9fcaae3765370f5331e4002d8dd6'
* commit 'eee1675aa40d9fcaae3765370f5331e4002d8dd6':
Look for Android.mk in $(APP_PROJECT_PATH)/jni by default.
Merge commit '197a8fea8e9ae0552b0d20fb5ba4562a851c1bca'
* commit '197a8fea8e9ae0552b0d20fb5ba4562a851c1bca':
Add sample "san-angeles" program to demo OpenGL ES from native code.
Merge commit 'd7e5aaecd896c0956e229304a7725509ab6e6af9'
* commit 'd7e5aaecd896c0956e229304a7725509ab6e6af9':
Add OpenGL ES headers to the android-4 platform/stable APIs.
Merge commit '5c767bb977506dae81680529044adc9f82b4765a'
* commit '5c767bb977506dae81680529044adc9f82b4765a':
Add android-4 sysroot and use project's default.properties to get the right target.
The primary usage for this code is to provide vendors / customers who for some
reasons are not satisfied with WinUsb, with a sample custom driver code that is
compliant with our AdbWinApi.dll. So vendors / customers can build their own
custom USB driver that can be recognized by AdbWinApi, and can be accessible from
adb.exe
Merge commit '91e0a8bb9cc1e1478bf65627dc4faeb82ee3825d'
* commit '91e0a8bb9cc1e1478bf65627dc4faeb82ee3825d':
Fix minor typo and duplicated entry in sdk.atree
This gets rid of the 'sources' directory and allows all sources
of a given Android application to be in the same directory tree
without using a symlink trick.
Note that apps/<name>/Application.mk is still required though.
A later release of the NDK will get rid of it too, but the change
is too drastic for the upcoming release.
The change moves various source files from sources into their
app/<name>/project/jni directory as well.
The whole documentation is updated to reflect the change.
Note that the app will only build against an android-4 SDK.
(Interestingly, the resulting binary runs very well under android-3).
This also adds missing license headers to the 'two-libs' sample.
