summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Dump GL errors and crash on failure to allocate texture for layerChris Craik2015-06-233-11/+10
* am 0bdd3204: am 4437a129: Merge "docs: Add link from TV design page on DAC to...Quddus Chong2015-06-201-0/+6
|\
| * am 4437a129: Merge "docs: Add link from TV design page on DAC to Android TV s...Quddus Chong2015-06-191-0/+6
| |\
| | * Merge "docs: Add link from TV design page on DAC to Android TV spec on Google...Quddus Chong2015-06-191-0/+6
| | |\
| | | * docs: Add link from TV design page on DAC to Android TV spec on Google Design...Quddus Chong2015-06-191-0/+6
* | | | am a5de0f30: am cdc28652: Merge "docs: Updated Recommending TV Content lesson...Quddus Chong2015-06-201-15/+43
|\ \ \ \ | |/ / /
| * | | am cdc28652: Merge "docs: Updated Recommending TV Content lesson to support c...Quddus Chong2015-06-191-15/+43
| |\ \ \ | | |/ /
| | * | Merge "docs: Updated Recommending TV Content lesson to support card customiza...Quddus Chong2015-06-191-15/+43
| | |\ \
| | | * | docs: Updated Recommending TV Content lesson to support card customization.Quddus Chong2015-06-191-15/+43
* | | | | Merge "Tweak assist disclosure animation" into mnc-devAdrian Roos2015-06-192-11/+43
|\ \ \ \ \
| * | | | | Tweak assist disclosure animationAdrian Roos2015-06-192-11/+43
* | | | | | Merge "MediaPlayer: documentation for error/info codes." into mnc-devRobert Shih2015-06-191-0/+18
|\ \ \ \ \ \
| * | | | | | MediaPlayer: documentation for error/info codes.Robert Shih2015-06-191-0/+18
* | | | | | | Merge "Fix spelling of a config variable." into mnc-devJunda Liu2015-06-193-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix spelling of a config variable.Jonathan Basseri2015-06-193-3/+3
* | | | | | | | Merge "Add libwilhelm to app_process." into mnc-devChristopher Ferris2015-06-191-2/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Add libwilhelm to app_process.Christopher Ferris2015-06-171-2/+11
* | | | | | | | | Merge "Grant default permissions if perms reset on upgrade." into mnc-devSvetoslav2015-06-191-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Grant default permissions if perms reset on upgrade.Svetoslav2015-06-191-1/+1
* | | | | | | | | | am 73187e57: am dd91362c: Make sure home activity gets resumed after started.Filip Gruszczynski2015-06-191-2/+12
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | am dd91362c: Make sure home activity gets resumed after started.Filip Gruszczynski2015-06-191-2/+12
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Make sure home activity gets resumed after started.Filip Gruszczynski2015-06-191-2/+12
* | | | | | | | | | | am c3fbb0ce: am bee8d60a: Fixes a typo where parens were used instead of curl...David Friedman2015-06-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am bee8d60a: Fixes a typo where parens were used instead of curly braces, pre...David Friedman2015-06-191-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | * | | | | | | | | Fixes a typo where parens were used instead of curly braces, preventingDavid Friedman2015-06-191-2/+2
* | | | | | | | | | | Merge "Change com.android.launcher.permission.INSTALL_SHORTCUT permission to ...Hyunyoung Song2015-06-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Change com.android.launcher.permission.INSTALL_SHORTCUT permission to normal ...Hyunyoung Song2015-06-191-2/+2
* | | | | | | | | | | | Merge "Fix a bug in Android Keystore updateAAD." into mnc-devAlex Klyubin2015-06-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix a bug in Android Keystore updateAAD.Alex Klyubin2015-06-191-1/+1
* | | | | | | | | | | | Merge "Only grant runtime permissions to special components." into mnc-devSvet Ganov2015-06-1911-160/+784
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Only grant runtime permissions to special components.Svet Ganov2015-06-1911-160/+784
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Support more KeySpecs in Android Keystore KeyFactory." into mnc-devAlex Klyubin2015-06-191-22/+76
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Support more KeySpecs in Android Keystore KeyFactory.Alex Klyubin2015-06-181-22/+76
* | | | | | | | | | | | | Merge "App Standby : Association between content providers and their sync ada...Amith Yamasani2015-06-1911-62/+248
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | App Standby : Association between content providers and their sync adapterAmith Yamasani2015-06-1911-62/+248
* | | | | | | | | | | | | | am cadd531e: am 4fdaf938: docs: Design section fixes for new templatesLuan Nguyen2015-06-195-126/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 4fdaf938: docs: Design section fixes for new templatesLuan Nguyen2015-06-195-126/+90
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | docs: Design section fixes for new templatesLuan Nguyen2015-06-195-126/+90
* | | | | | | | | | | | | | Merge "Apply the scale to surfaceinsets when computing crop region" into mnc-devWale Ogunwale2015-06-191-4/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Apply the scale to surfaceinsets when computing crop regionseunghyun85.lee2015-06-191-4/+15
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "[RenderScript] Add documentation for IntrinsicBLAS, and @hide annotati...Miao Wang2015-06-193-28/+1733
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | [RenderScript] Add documentation for IntrinsicBLAS, and @hideMiao Wang2015-06-173-28/+1733
* | | | | | | | | | | | | | | Merge "BatteryStats: Record doze wake locks" into mnc-devAdam Lesinski2015-06-192-13/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | BatteryStats: Record doze wake locksAdam Lesinski2015-06-192-13/+59
* | | | | | | | | | | | | | | | am a8b518d7: am 041e01bb: am 003f8567: Merge "updates: build-cmdline-update" ...Joe Fernandez2015-06-191-7/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 041e01bb: am 003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-...Joe Fernandez2015-06-191-7/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am 003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docsJoe Fernandez2015-06-191-7/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "updates: build-cmdline-update" into lmp-mr1-ub-docsJoe Fernandez2015-06-191-7/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | updates: build-cmdline-updateRich Slogar2015-06-091-7/+0
* | | | | | | | | | | | | | | | | | Merge "Don't save cached contact info in call log when adding call" into mnc-devYorke Lee2015-06-191-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \