summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | * | | | | | | | | | Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-devJoe Fernandez2013-02-131-4/+4
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | docs: SDK r21.1 - fix download links, Issue 8193979Joe Fernandez2013-02-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iabbbb030d50390021feab478812140158cdfd104
* | | | | | | | | | | | | | | | Merge "Stop using AppToken movement and start using Task."Craig Mautner2013-02-134-43/+195
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Stop using AppToken movement and start using Task.Craig Mautner2013-02-134-43/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5fbd3b2b692e0e127386051f782b1015515ba384
* | | | | | | | | | | | | | | | | am f796c279: am e526eedb: am 1f6dbc0d: am c6608215: am d51a894a: docs: fix ↵Scott Main2013-02-131-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tools sidenav for offline docs # Via Android Git Automerger (4) and Scott Main (1) * commit 'f796c2793388184e2642afd8e244762d48d54761': docs: fix tools sidenav for offline docs
| * | | | | | | | | | | | | | | | am e526eedb: am 1f6dbc0d: am c6608215: am d51a894a: docs: fix tools sidenav ↵Scott Main2013-02-131-13/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for offline docs # Via Android Git Automerger (3) and Scott Main (1) * commit 'e526eedb8e0145f96991219abd9022ef52f4b976': docs: fix tools sidenav for offline docs
| | * | | | | | | | | | | | | | | am 1f6dbc0d: am c6608215: am d51a894a: docs: fix tools sidenav for offline docsScott Main2013-02-131-13/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android Git Automerger (2) and Scott Main (1) * commit '1f6dbc0dccd6eba712848ac36bace4fc16f84fd1': docs: fix tools sidenav for offline docs
| | | * | | | | | | | | | | | | | am c6608215: am d51a894a: docs: fix tools sidenav for offline docsScott Main2013-02-131-13/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android Git Automerger (1) and Scott Main (1) * commit 'c660821502e5e27d10ea2d9248fb3c700f5560e5': docs: fix tools sidenav for offline docs
| | | | * | | | | | | | | | | | | am d51a894a: docs: fix tools sidenav for offline docsScott Main2013-02-131-13/+13
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Scott Main * commit 'd51a894a50b6dd48023fdc5b79c6f889a3988903': docs: fix tools sidenav for offline docs
| | | | | * | | | | | | | | | | | docs: fix tools sidenav for offline docsScott Main2013-02-131-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If15ec25f395d9e18f35085488b75be8f84a6d42f
* | | | | | | | | | | | | | | | | Merge "Add tests for the new clipped kernel Java reflection."Stephen Hines2013-02-132-19/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Add tests for the new clipped kernel Java reflection.Stephen Hines2013-02-132-19/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idb0444823711da356ae0ac025aa79c6ff8068373
* | | | | | | | | | | | | | | | | | Merge "Revert "Merge remote-tracking branch 'goog/master-chromium' into ↵Chris Craik2013-02-1326-134/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'goog/master'" DO NOT MERGE"
| * | | | | | | | | | | | | | | | | | Revert "Merge remote-tracking branch 'goog/master-chromium' into ↵Chris Craik2013-02-1326-134/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'goog/master'" DO NOT MERGE This reverts commit 6c0307dd0aefe9a08794b155fc03ee60ebd14f25, reversing changes made to a2cd828b749c444d55c2c41c7dbb85088ff94b9f. Conflicts: packages/SystemUI/res/values-sv/strings.xml Change-Id: Ia178efe8b14751583d47b2826bfe3d3d5463dd2e
* | | | | | | | | | | | | | | | | | | Merge "Fixing a NPE in accessibility manager service."Svetoslav2013-02-131-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fixing a NPE in accessibility manager service.Svetoslav2013-02-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a missing null checks as a result of a recent refactoring. bug:8185435 Change-Id: I3a1e256b434755b3a27f609dd2b6aeec31aa9a4f
* | | | | | | | | | | | | | | | | | | Merge "Expose EAP config API"Irfan Sheriff2013-02-133-5/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Expose EAP config APIIrfan Sheriff2013-02-133-5/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This API allows apps to setup access to enterprise Wi-Fi networks. Change-Id: I37573d76b8bd9cad72413afdc4fc62ce57b4dc43
* | | | | | | | | | | | | | | | | | | | Merge "Add exception types for NfcEe operations."Martijn Coenen2013-02-137-9/+218
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Add exception types for NfcEe operations.Martijn Coenen2013-02-127-9/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow apps to present a better UI in the different failure cases. Bug: 4304698 Change-Id: Ia378cc5530c1a7488f38a4be84f9fed8c2aa8c86
* | | | | | | | | | | | | | | | | | | | | Merge "Add rsnScriptForEachClipped() implementation with no param array."Stephen Hines2013-02-132-3/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / |/| | | | / / / / / / / / / / / / / / / / | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add rsnScriptForEachClipped() implementation with no param array.Stephen Hines2013-02-132-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JNI doesn't let us pass down a NULL parameter array (from the usrData part of our reflection). In this case, we simply clone our existing function, but remove the offending array parameter. Change-Id: Ib1d6e202f2a55ba8922eec3da5a93d8daa882250
* | | | | | | | | | | | | | | | | | | | Merge "Revert "Fix for bug: 8184401 - GridLayout accounts for child's ↵Philip Milne2013-02-131-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size/measurements even when a child is "GONE"""
| * | | | | | | | | | | | | | | | | | | Revert "Fix for bug: 8184401 - GridLayout accounts for child's ↵Philip Milne2013-02-131-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size/measurements even when a child is "GONE"" Suspected cause of: http://b.corp.google.com/issue?id=8192858 This reverts commit e5e0b7f191b64380e9231a2b755ecd3738598dec Change-Id: I1a35c12c3ca0b1eacfb0c1a4d6ba03601dab664b
* | | | | | | | | | | | | | | | | | | | Merge "Revert "Use RenderScript for large text blurs""Chris Craik2013-02-135-113/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Revert "Use RenderScript for large text blurs"Chris Craik2013-02-135-113/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3f76e65d251ead65fe8ff98e3bd4c7623fbaac07 Change-Id: Ia81cd485e5ca696bb284c419dc8a1d2f3247100e
* | | | | | | | | | | | | | | | | | | | | Merge "Replace access to mAppTokens with AppTokenIterator"Craig Mautner2013-02-133-53/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Replace access to mAppTokens with AppTokenIteratorCraig Mautner2013-02-123-53/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More switching from Activity-based to Task-based control. Change-Id: Ida47d71a52b875a6a6bd77cb62911053f942da15
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix AudioFocus for back-to-back notifications"Jean-Michel Trivi2013-02-131-12/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fix AudioFocus for back-to-back notificationsJean-Michel Trivi2013-02-131-12/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A single instance of NotificationPlayer will play notifications back-to-back, and was, for each requesting AudioFocus. But as a new notification was about to be played, its accompanying thread was terminated, and the completion listener was never called, and therefore AudioFocus was not released (e.g. two requests for one release). The fix consists in requesting AudioFocus only once and abandonning it when the only reported completion is received. Added a FIXME note about a better solution to be implemented. Bug 7680947 Change-Id: Ica9d5c1eb5d57c89ceebe66282af69f0f7d43667
* | | | | | | | | | | | | | | | | | | | | | Merge "No AudioFocus for notifications when media played remotely"Jean-Michel Trivi2013-02-131-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | No AudioFocus for notifications when media played remotelyJean-Michel Trivi2013-02-121-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use AudioFocus when playing a notification when media is playing remotely. This behavior may be accompanied by rules in the device's audio policy to not route the notifications to the remote display. Bug 7485803 Change-Id: I8b96aa59cace75f6e9a0e73799ef8c75e9ee97aa
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix format name typo"Romain Guy2013-02-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Fix format name typoRomain Guy2013-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If7d86b74ad9735f12349d9fcb62b335f5a742bb5
* | | | | | | | | | | | | | | | | | | | | | | Merge "Use RenderScript for large text blurs"Chris Craik2013-02-135-18/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Use RenderScript for large text blursChris Craik2013-02-125-18/+113
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still fall back to simple path for small tasks Change-Id: I492f1b3f7d6fec1738f3e45cbfb15864bd23a392
* | | | | | | | | | | | | | | | | | | | | | Merge "Escape arguments before passing to netd."Jeff Sharkey2013-02-131-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Escape arguments before passing to netd.Jeff Sharkey2013-02-131-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I70bb0cb1e90abd490f8893365c6bdf1844b01d18
* | | | | | | | | | | | | | | | | | | | | | | Merge "Add a render buffer cache to reuse stencil buffers Bug #7146141"Romain Guy2013-02-1313-23/+347
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Add a render buffer cache to reuse stencil buffersRomain Guy2013-02-1313-23/+347
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #7146141 This new cache is used in a similar way to LayerCache. It helps reuse already allocated stencil buffers and thus avoid churning memory on every frame. Change-Id: I19551d72da52c40039e65904563600e492c8b193
* | | | | | | | | | | | | | | | | | | | | | | Merge "Clean Paint.mBidiFlags as it is no longer used"Fabrice Di Meglio2013-02-1320-1162/+299
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Clean Paint.mBidiFlags as it is no longer usedFabrice Di Meglio2013-02-1220-1162/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See bug #7623824 Change-Id: Ie2f9422821f6dcc73c99e8695f448e966b587b1d
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Count baseGlyphCount once for scripts without typefaces"Victoria Lease2013-02-131-5/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Count baseGlyphCount once for scripts without typefacesVictoria Lease2013-02-121-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Characters from complex scripts without dedicated typefaces were getting baseGlyphCount counted twice: once in shapeFontRun() and then a second time during SkScalerContext::getNextContext() chaining. This was a problem for text runs beginning with full-width Latn characters - shapeFontRun() would get the base glyph count for the typeface containing those characters, then realise it had no typeface specified for the Latn script, resetting the typeface to default without resetting the base glyph count along with it. Mojibake full-width Latn characters, ho! The same issue also affected Cherokee text, which this fix also addresses. Bug: 8127795 Bug: 8034351 Change-Id: I058d81cffbbf86426cc3c5aafcc91a76f4fe6b62
* | | | | | | | | | | | | | | | | | | | | | | | am 1214e975: am 3baf1b6f: am 60d8836e: am be4d1dcd: am dd8b5845: Merge ↵Scott Main2013-02-132-6/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "docs: add info about secure adb" into jb-mr1-dev # Via Android Git Automerger (4) and others * commit '1214e975d65dc5604ac95ed3ce7565333fa3e364': docs: add info about secure adb
| * | | | | | | | | | | | | | | | | | | | | | | am 3baf1b6f: am 60d8836e: am be4d1dcd: am dd8b5845: Merge "docs: add info ↵Scott Main2013-02-132-6/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | about secure adb" into jb-mr1-dev # Via Android Git Automerger (3) and others * commit '3baf1b6f44c8f9f851e165f1b818a475b4b09fed': docs: add info about secure adb
| | * | | | | | | | | | | | | | | | | | | | | | am 60d8836e: am be4d1dcd: am dd8b5845: Merge "docs: add info about secure ↵Scott Main2013-02-132-6/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adb" into jb-mr1-dev # Via Android Git Automerger (2) and others * commit '60d8836e0dcd46645d73ef7fb34257aef5e5a927': docs: add info about secure adb
| | | * | | | | | | | | | | | | | | | | | | | | am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb" into ↵Scott Main2013-02-132-6/+38
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev # Via Android (Google) Code Review (1) and others * commit 'be4d1dcd0118e2933c8467a13d5e8cb7abbb9707': docs: add info about secure adb
| | | | * | | | | | | | | | | | | | | | | | | | am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-devScott Main2013-02-132-6/+38
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Scott Main (1) * commit 'dd8b58457c6ce18ec98f1b2419300aa8c9cd326d': docs: add info about secure adb
| | | | | * | | | | | | | | | | | | | | | | | | Merge "docs: add info about secure adb" into jb-mr1-devScott Main2013-02-132-6/+38
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \