Merge commit '1bb52f25870a0f183b9c5a24362c2468fb316435'
* commit '1bb52f25870a0f183b9c5a24362c2468fb316435':
Fix ADT junit test for AndroidManifestParser following API change.
We currently hardcode a list in the PlatformTarget and propagate
it to the UI via the AndroidTargetParser. This way we can later
decide to actually get the info from some kind of manifest.
Merge commit 'beb3214b46e18bb461760c47f04c5b909557d060'
* commit 'beb3214b46e18bb461760c47f04c5b909557d060':
ADT #1823896: Ability to add an "extra" action to the AVD Selector.
Used to display the AVD Manager from the Device Chooser/Launch config.
Used to delete AVDs from the AVD Manager.
In AVD Manager, also hide the Cancel button since actions are
immediate and not cancelable.
Merge commit 'ae23694d167404857034b269b6a0cce4da790d64'
* commit 'ae23694d167404857034b269b6a0cce4da790d64':
Make sure we request the Client allocation status even if we fail to open a debugger port for it.
Merge commit '70fc6e96af1213c192160a16803feb220e10c561'
* commit '70fc6e96af1213c192160a16803feb220e10c561':
Make sure that any exception during the final packaging properly put an error marker on the project (since build failed.
Merge commit '8ffde4bf375063f622a5227c349506cb6721f660'
* commit '8ffde4bf375063f622a5227c349506cb6721f660':
ADT #1820114: Provide a quick UI to edit AVD.
Merge commit '594999277ec269bc706647b23ecc11e16f12a971'
* commit '594999277ec269bc706647b23ecc11e16f12a971':
Fix a bunch of issues related to packaging the content of libs (NPE with files with no extension, not ignoring ignorable folders). Also fixed an issue when parsing Manifest with <uses-sdk />
Merge commit 'b1be9fb5098a6ccc2117df5a82e96aba6778edf1'
* commit 'b1be9fb5098a6ccc2117df5a82e96aba6778edf1':
Make traceview compile with the new API from SdkStats.
Merge commit 'dc7622dca5bd355d57dd07c332d40b2a16b79bdc'
* commit 'dc7622dca5bd355d57dd07c332d40b2a16b79bdc':
Fix the opt-in window for usage stat so that it works when running from ADT.
Merge commit 'aa8c266ed05c08af71bfdaa48de44bec3d581102'
* commit 'aa8c266ed05c08af71bfdaa48de44bec3d581102':
Split development/.gitignore into separate gitignore files per project.
Merge commit '782884aef34a060c280f7be640e8c2e715750ce8'
* commit '782884aef34a060c280f7be640e8c2e715750ce8':
Fixed a bug in XML parser handler where some words were being split in two. Fixes#1812655.
Merge commit 'cdf36733a3f7b92c2f3ba36e07d80c12b2af71e5'
* commit 'cdf36733a3f7b92c2f3ba36e07d80c12b2af71e5':
yuv420sp2rgb: a tool to convert from YUV 4:2:0 semiplanar to various RGB formats
* changes:
Fix a bunch of issues related to packaging the content of libs (NPE with files with no extension, not ignoring ignorable folders). Also fixed an issue when parsing Manifest with <uses-sdk />