summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Link to new app notification settings from the inspector." into lmp-devDan Sandler2014-08-077-94/+63
|\
| * Link to new app notification settings from the inspector.Dan Sandler2014-08-077-94/+63
* | Merge "Remove String version of getBadgedLabel" into lmp-devKenny Guy2014-08-051-9/+0
|\ \
| * | Remove String version of getBadgedLabelKenny Guy2014-08-071-9/+0
* | | am 001e3072: am 23daa441: am 8e115e64: Merge "docs: Documenting fix for CVE-2...Robert Ly2014-08-072-0/+306
|\ \ \
| * \ \ am 23daa441: am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL...Robert Ly2014-08-072-0/+306
| |\ \ \
| | * \ \ am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerabilit...Robert Ly2014-08-072-0/+306
| | |\ \ \
| | | * \ \ Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp...Robert Ly2014-08-072-0/+306
| | | |\ \ \
| | | | * | | docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).Andrew Solovay2014-07-302-0/+306
* | | | | | | Merge "ImageReader: fix documentation, relax some guarantees" into lmp-devLajos Molnar2014-08-071-17/+21
|\ \ \ \ \ \ \
| * | | | | | | ImageReader: fix documentation, relax some guaranteesLajos Molnar2014-08-061-17/+21
* | | | | | | | Allow TimePicker/DatePicker to use legacy layout styleChet Haase2014-08-0712-40/+73
* | | | | | | | Merge "BG protection for user switcher on Keyguard." into lmp-devJorim Jaggi2014-08-078-20/+147
|\ \ \ \ \ \ \ \
| * | | | | | | | BG protection for user switcher on Keyguard.Jorim Jaggi2014-08-078-20/+147
* | | | | | | | | Merge "Need to post-process all action icons to get the correct color." into ...Dan Sandler2014-08-071-3/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Need to post-process all action icons to get the correct color.Dan Sandler2014-08-061-3/+1
* | | | | | | | | Merge "Fix NPE in DevicePolicyManagerService that crashed SystemUI" into lmp-devAdrian Roos2014-08-051-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix NPE in DevicePolicyManagerService that crashed SystemUIAdrian Roos2014-08-071-1/+2
* | | | | | | | | | Merge "Fix screenshots." into lmp-devDan Sandler2014-08-071-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix screenshots.Dan Sandler2014-08-071-0/+3
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Pass initiatedByUser to TrustListeners" into lmp-devAdrian Roos2014-08-076-23/+41
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Pass initiatedByUser to TrustListenersAdrian Roos2014-08-076-23/+41
| |/ / / / / / / /
* | | | | | | | | Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-devZoltan Szatmary-Ban2014-08-074-42/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Update Trusted Credentials screen in settings"Zoltan Szatmary-Ban2014-08-074-42/+29
* | | | | | | | | | Merge "Update Trusted Credentials screen in settings" into lmp-devZoltan Szatmary-Ban2014-08-054-29/+42
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Update Trusted Credentials screen in settingsZoltan Szatmary-Ban2014-07-294-29/+42
* | | | | | | | | Merge "Update User switcher to new spec, implement adding users" into lmp-devAdrian Roos2014-08-0715-85/+240
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Update User switcher to new spec, implement adding usersAdrian Roos2014-08-0615-85/+240
* | | | | | | | | Merge "Permit crash report button for user profiles" into lmp-devRobin Lee2014-08-051-8/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Permit crash report button for user profilesRobin Lee2014-08-071-8/+10
* | | | | | | | | | TIF: Handle setMainSession for TV input wrapper servicesJi-Hwan Lee2014-08-071-17/+29
|/ / / / / / / / /
* | | | | | | | | Merge "Wipe only managed profile when max number of incorrect passwords excee...Esteban Talavera2014-08-052-27/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Wipe only managed profile when max number of incorrect passwords exceededEsteban Talavera2014-08-062-27/+46
* | | | | | | | | | Disallow switching managed profile to foregroundRobin Lee2014-08-071-0/+4
* | | | | | | | | | Allow to use device's own physical address.Yuncheol Heo2014-08-071-4/+7
* | | | | | | | | | Go to nap when receiving <Active Source> for the other devices.Yuncheol Heo2014-08-072-1/+6
* | | | | | | | | | TIF: Add system API 'isSingleSessionActive()'Terry Heo2014-08-073-0/+43
* | | | | | | | | | Move image classes options from art to AndroidRuntime [frameworks/base]Brian Carlstrom2014-08-061-0/+4
* | | | | | | | | | Disable compilation based on vold.decrypt. [frameworks/base]Brian Carlstrom2014-08-062-107/+66
* | | | | | | | | | Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [framewor...Brian Carlstrom2014-08-062-0/+46
* | | | | | | | | | resolved conflicts for merge of 37651b60 to lmp-dev-plus-aospAlex Light2014-08-062-6/+67
* | | | | | | | | | Merge "Use message validator for sending message." into lmp-devJungshik Jang2014-08-042-10/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use message validator for sending message.Jungshik Jang2014-08-072-10/+9
* | | | | | | | | | | Fix cross-user talk.Svetoslav2014-08-072-11/+18
* | | | | | | | | | | Merge "Rename FeatureAction into HdmiCecFeatureAction" into lmp-devJungshik Jang2014-08-0418-57/+55
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Rename FeatureAction into HdmiCecFeatureActionJungshik Jang2014-08-0718-57/+55
* | | | | | | | | | | | JobScheduler idle mode not being properly triggeredMatthew Williams2014-08-072-10/+37
|/ / / / / / / / / / /
* | | | | | | | | | | Merge "Common shade width across devices." into lmp-devJohn Spurlock2014-08-0519-90/+132
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Common shade width across devices.John Spurlock2014-08-0619-90/+132
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Switch CaptivePortalLogin app to use theme like Settings UI.Paul Jensen2014-08-074-7/+19
| |/ / / / / / / / |/| | | | | | | |