Merge commit '140eed1ac513d26debca9ec92ffaea930a4c1736'
* commit '140eed1ac513d26debca9ec92ffaea930a4c1736':
AI 148129: Missing \ in Pdk.Mk causing build to not go through - Gaurav
Merge commit '7e2a21adcc304b9aea01a9dc68af384fde5c314e'
* commit '7e2a21adcc304b9aea01a9dc68af384fde5c314e':
AI 148128: -Removed "Option1" about using buildspec which is no longer relevant.
Merge commit '969e009757c58a9f806f88f04fc6071150ae7478'
* commit '969e009757c58a9f806f88f04fc6071150ae7478':
AI 148105: Assigning to Ryan for Dr No Approval.
Merge commit '22056a6526fd754a3a4cd99cdad5001c85a6b623'
* commit '22056a6526fd754a3a4cd99cdad5001c85a6b623':
AI 148100: Testing out PDK updates by updating /device/partner/ references in the "building a new device" steps
Merge commit '5941176ccd7f05ed1786f0b45ecc0905b0effc49'
* commit '5941176ccd7f05ed1786f0b45ecc0905b0effc49':
Move some simulator fixes from master to donut.
Merge commit '2b15cf1abf2f41e3a9f7edc99d65a9e9d38e6c25' into donut
* commit '2b15cf1abf2f41e3a9f7edc99d65a9e9d38e6c25':
AI 148129: Missing \ in Pdk.Mk causing build to not go through - Gaurav
Merge commit '390be0e33d61654113b4bdc9b1974b33eebd2205' into donut
* commit '390be0e33d61654113b4bdc9b1974b33eebd2205':
AI 148128: -Removed "Option1" about using buildspec which is no longer relevant.
Merge commit '1b4feb4926e8b34b10569f492a7f06175d3829bb' into donut
* commit '1b4feb4926e8b34b10569f492a7f06175d3829bb':
AI 148118: 2 new debugging docs.
Merge commit 'e0d7b8a65d51912228d920f8b884f401146531e2' into donut
* commit 'e0d7b8a65d51912228d920f8b884f401146531e2':
AI 148117: these docs have moved into "guide" directory.
Merge commit '5f6ca4f519a1a9375628102f284ab059fd0ef4a1' into donut
* commit '5f6ca4f519a1a9375628102f284ab059fd0ef4a1':
AI 148105: Assigning to Ryan for Dr No Approval.
Merge commit '9844b7560db1101ef69186fa93fc062ca9fe7c3a' into donut
* commit '9844b7560db1101ef69186fa93fc062ca9fe7c3a':
AI 148100: Testing out PDK updates by updating /device/partner/ references in the "building a new device" steps
* changes:
Move some simulator fixes from master to donut. In git master they were part of change 700ccfcc01, which was an auto import from //branches/master/...@140412 The original change was 134529 in perforce.
In git master they were part of change 700ccfcc01,
which was an auto import from //branches/master/...@140412
The original change was 134529 in perforce.
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 'fba8d837f5d926dc3f469a99edb22f55d69dff76'
* commit 'fba8d837f5d926dc3f469a99edb22f55d69dff76':
AI 147991: make sources appear in online-pdk/guide
Merge commit 'aa2d95234e8350eebf789da2b976f843318dead8' into donut
* commit 'aa2d95234e8350eebf789da2b976f843318dead8':
AI 147991: make sources appear in online-pdk/guide
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 '82ce5582419cb1a4f1108c2946bac138c3446b21'
* commit '82ce5582419cb1a4f1108c2946bac138c3446b21':
AI 147793: cleanup broken links and delete all innacurate info in apidemo pages
Merge commit '5ea0a9436cda662264cc0dcf92d3559d532383bb'
* commit '5ea0a9436cda662264cc0dcf92d3559d532383bb':
Fix a memory deallocation error that was crashing q2dm.
Merge commit '68fee208248b8a7cc05033156c8acdb5c74b9fa7'
* commit '68fee208248b8a7cc05033156c8acdb5c74b9fa7':
Fix cygwin git script, we need some of the external projects.
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.
