summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Don't save cached contact info in call log when adding callYorke Lee2015-06-191-5/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Invalidate the cached ripple drawable mask if mask layer changes" into...Alan Viverette2015-06-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Invalidate the cached ripple drawable mask if mask layer changesAlan Viverette2015-06-191-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add comments to carrierconfigmanager for required permission." into mn...Junda Liu2015-06-191-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Add comments to carrierconfigmanager for required permission.Junda Liu2015-06-191-0/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Migrate 'csp_enabled' to CarrierConfigManager." into mnc-devJonathan Basseri2015-06-193-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate 'csp_enabled' to CarrierConfigManager.Jonathan Basseri2015-06-193-0/+11
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ImageReader: Fix format workarounds for legacy devices" into mnc-devChien-Yu Chen2015-06-192-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ImageReader: Fix format workarounds for legacy devicesChien-Yu Chen2015-06-172-3/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Create ListPopupWindow handler against main looper" into mnc-devAlan Viverette2015-06-191-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Create ListPopupWindow handler against main looperAlan Viverette2015-06-181-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Clarify handling client certificates" into mnc-devSelim Gurun2015-06-191-4/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Clarify handling client certificatesSelim Gurun2015-06-191-4/+17
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Assist disclosureAdrian Roos2015-06-1910-3/+328
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix intent tile to unlock on launching activities" into mnc-devJason Monk2015-06-198-12/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fix intent tile to unlock on launching activitiesJason Monk2015-06-198-12/+16
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Better FloatingToolbar positioning." into mnc-devAbodunrinwa Toki2015-06-191-21/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Better FloatingToolbar positioning.Abodunrinwa Toki2015-06-191-21/+35
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Replace --include-cfi with --generate-debug-info." into mnc-devDavid Srbecky2015-06-195-16/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace --include-cfi with --generate-debug-info.David Srbecky2015-06-195-16/+16
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Resolve canonical package path before writing it to packages.list." in...Oleksiy Vyalov2015-06-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve canonical package path before writing it to packages.list.Oleksiy Vyalov2015-06-181-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Work around inconsistent views in RelativeLayout.onMeasure()""...Alan Viverette2015-06-191-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Work around inconsistent views in RelativeLayout.onMeasure()"Alan Viverette2015-06-191-9/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Debug logging for a certain class of binder transaction failures" into...Christopher Tate2015-06-191-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Debug logging for a certain class of binder transaction failuresChristopher Tate2015-06-191-2/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Clear granted permission when app is uninstalled by one of the multipl...Tony Mak2015-06-191-1/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \