summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Zen: Tweak total silence new user message for non-voice devices." into...John Spurlock2015-06-213-2/+16
|\
| * Zen: Tweak total silence new user message for non-voice devices.John Spurlock2015-06-213-2/+16
* | Do not thrown on error persisting runtime permissionsSvet Ganov2015-06-201-2/+0
* | Ensure default permissions not dropped on data wipeSvet Ganov2015-06-201-0/+3
* | Make READ_EXTERNAL_STORAGE dangerousSvet Ganov2015-06-191-1/+1
* | Merge "Revert "Clarify handling client certificates"" into mnc-devBart Sears2015-06-201-17/+4
|\ \
| * | Revert "Clarify handling client certificates"Bart Sears2015-06-201-17/+4
* | | Fixed content description of the lock icon when fingerprint is onSelim Cinek2015-06-204-4/+37
* | | Merge "Occasionally retest for captive portals once detected" into mnc-devPaul Jensen2015-06-201-0/+18
|\ \ \
| * | | Occasionally retest for captive portals once detectedPaul Jensen2015-06-191-0/+18
* | | | Merge "Speed up network transition when WiFi disconnects" into mnc-devPaul Jensen2015-06-201-12/+23
|\ \ \ \
| * | | | Speed up network transition when WiFi disconnectsPaul Jensen2015-06-201-12/+23
| |/ / /
* | | | Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, Pendin...Paul Jensen2015-06-204-3/+62
|\ \ \ \
| * | | | Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)Paul Jensen2015-06-184-3/+62
| |/ / /
* | | | Merge "Don't send spurious onAvailable NetworkCallbacks when rematching" into...Paul Jensen2015-06-203-39/+260
|\ \ \ \
| * | | | Don't send spurious onAvailable NetworkCallbacks when rematchingPaul Jensen2015-06-193-39/+260
* | | | | Merge "Fix regression in viewing app info from ChooserActivity targets" into ...Adam Powell2015-06-202-0/+46
|\ \ \ \ \
| * | | | | Fix regression in viewing app info from ChooserActivity targetsAdam Powell2015-06-192-0/+46
* | | | | | Merge "Frameworks/base: Update preloaded-classes" into mnc-devAndreas Gampe2015-06-201-285/+1104
|\ \ \ \ \ \
| * | | | | | Frameworks/base: Update preloaded-classesAndreas Gampe2015-06-181-285/+1104
* | | | | | | Merge "Fix access point list jumping around in WifiSettings" into mnc-devVinit Deshpande2015-06-202-131/+221
|\ \ \ \ \ \ \
| * | | | | | | Fix access point list jumping around in WifiSettingsVinit Deshpande2015-06-182-131/+221
* | | | | | | | Merge "Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user cho...Doris Liu2015-06-201-7/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choiceDoris Liu2015-06-191-7/+21
* | | | | | | | | 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