summaryrefslogtreecommitdiffstats
Commit message (Expand)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
* | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | am f796c279: am e526eedb: am 1f6dbc0d: am c6608215: am d51a894a: docs: fix to...Scott Main2013-02-131-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am e526eedb: am 1f6dbc0d: am c6608215: am d51a894a: docs: fix tools sidenav f...Scott Main2013-02-131-13/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am 1f6dbc0d: am c6608215: am d51a894a: docs: fix tools sidenav for offline docsScott Main2013-02-131-13/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | am c6608215: am d51a894a: docs: fix tools sidenav for offline docsScott Main2013-02-131-13/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | am d51a894a: docs: fix tools sidenav for offline docsScott Main2013-02-131-13/+13
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / | | | | | |/| | | | | | | | | | |
| | | | | * | | | | | | | | | | | docs: fix tools sidenav for offline docsScott Main2013-02-131-13/+13
* | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | Merge "Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog...Chris Craik2013-02-1326-134/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master...Chris Craik2013-02-1326-134/+131
* | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | Merge "Expose EAP config API"Irfan Sheriff2013-02-133-5/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Expose EAP config APIIrfan Sheriff2013-02-133-5/+66
* | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | Merge "Revert "Fix for bug: 8184401 - GridLayout accounts for child's size/me...Philip Milne2013-02-131-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Revert "Fix for bug: 8184401 - GridLayout accounts for child's size/measureme...Philip Milne2013-02-131-2/+0
* | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | Merge "Replace access to mAppTokens with AppTokenIterator"Craig Mautner2013-02-133-53/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Replace access to mAppTokens with AppTokenIteratorCraig Mautner2013-02-123-53/+61
* | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix format name typo"Romain Guy2013-02-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Fix format name typoRomain Guy2013-02-131-1/+1
* | | | | | | | | | | | | | | | | | | | | | | Merge "Use RenderScript for large text blurs"Chris Craik2013-02-135-18/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Use RenderScript for large text blursChris Craik2013-02-125-18/+113
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | am 1214e975: am 3baf1b6f: am 60d8836e: am be4d1dcd: am dd8b5845: Merge "docs:...Scott Main2013-02-132-6/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | am 3baf1b6f: am 60d8836e: am be4d1dcd: am dd8b5845: Merge "docs: add info abo...Scott Main2013-02-132-6/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | am 60d8836e: am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb...Scott Main2013-02-132-6/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1...Scott Main2013-02-132-6/+38
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-devScott Main2013-02-132-6/+38
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | Merge "docs: add info about secure adb" into jb-mr1-devScott Main2013-02-132-6/+38
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \