summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Fix memory corruption in testJohn Reck2014-10-161-0/+1
* | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-2221-195/+191
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge "Debug for bug 18017409" into lmp-mr1-devCraig Mautner2014-10-222-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Debug for bug 18017409Craig Mautner2014-10-212-5/+5
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | am e463bc38: am 3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at e...Leon Scroggins III2014-10-221-0/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | am 3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp...Leon Scroggins III2014-10-211-0/+5
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-devLeon Scroggins III2014-10-211-0/+5
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Report that a JavaInputStreamAdaptor is at end.Leon Scroggins III2014-10-201-0/+5
* | | | | | | | | | | am fc567900: am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behavi...Robin Lee2014-10-221-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp...Robin Lee2014-10-211-1/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-devRobin Lee2014-10-211-1/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | DevicePolicy: Restore CA warning to K behaviourRobin Lee2014-10-201-1/+0
* | | | | | | | | | | Merge "TIF: add more documentation on Hardware session." into lmp-mr1-devDongwon Kang2014-10-221-3/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | TIF: add more documentation on Hardware session.Dongwon Kang2014-10-201-3/+13
* | | | | | | | | | | | Merge "Format ListPreference summary with empty string if entry is null" into...Alan Viverette2014-10-221-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Format ListPreference summary with empty string if entry is nullAlan Viverette2014-10-211-2/+2
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Intent chooser callback" into lmp-mr1-devAdam Powell2014-10-214-0/+87
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Intent chooser callbackAdam Powell2014-10-214-0/+87
* | | | | | | | | | | | | Merge "Add video calling setting to TelephonyManager." into lmp-mr1-devAndrew Lee2014-10-212-1/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add video calling setting to TelephonyManager.Andrew Lee2014-10-212-1/+36
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Surface:lockHardwareCanvas" into lmp-mr1-devJohn Reck2014-10-218-16/+436
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Surface:lockHardwareCanvasJohn Reck2014-10-218-16/+436
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Fire onConferenceChanged after reseting conference." into lmp-mr1-devAndrew Lee2014-10-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fire onConferenceChanged after reseting conference.Andrew Lee2014-10-211-0/+1
* | | | | | | | | | | | | VolumeDialog: Restore default-selection logic.John Spurlock2014-10-211-1/+2
| |_|_|/ / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge "Settings: Make SeekBarVolumizer more null-resilient." into lmp-mr1-devJohn Spurlock2014-10-212-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Settings: Make SeekBarVolumizer more null-resilient.John Spurlock2014-10-212-3/+6
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Fix gradient drawable radius when specified as float, dimension" into ...Alan Viverette2014-10-212-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix gradient drawable radius when specified as float, dimensionAlan Viverette2014-10-212-2/+5
* | | | | | | | | | | | | Merge "Sysui: Include shared prefs in service dump." into lmp-mr1-devJohn Spurlock2014-10-213-33/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Sysui: Include shared prefs in service dump.John Spurlock2014-10-213-33/+7
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Prevent excessive accessibility announcements in TimePicker" into lmp-...Alan Viverette2014-10-211-17/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Prevent excessive accessibility announcements in TimePickerAlan Viverette2014-10-171-17/+30
* | | | | | | | | | | | | | Merge "Propagate state changes even when we don't change drawable index" into...Alan Viverette2014-10-211-21/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Propagate state changes even when we don't change drawable indexAlan Viverette2014-10-201-21/+9
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | am deddb384: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-spr...Geoff Mendal2014-10-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | / / / / / / | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-sprout-devGeoff Mendal2014-10-2017-0/+19
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-2017-0/+19
* | | | | | | | | | | | | Merge "CEC: Add missing protections for some HdmiControlService API" into lmp...Jinsuk Kim2014-10-201-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | CEC: Add missing protections for some HdmiControlService APIJinsuk Kim2014-10-211-0/+6
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | am f0a28411: am 2fa604fc: Merge "Add missing break to switch statement" into ...RoboErik2014-10-201-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am 2fa604fc: Merge "Add missing break to switch statement" into lmp-devRoboErik2014-10-201-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Add missing break to switch statement" into lmp-devRoboErik2014-10-201-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Add missing break to switch statementRoboErik2014-10-201-0/+1
* | | | | | | | | | | | | | Merge "Add a constant for invalid profile id value" into lmp-mr1-devAmit Mahajan2014-10-201-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add a constant for invalid profile id valueHui Wang2014-10-201-0/+1
* | | | | | | | | | | | | | | am aec92e2e: Merge "Disable zen log printouts by default" into lmp-sprout-devGriff Hazen2014-10-201-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Disable zen log printouts by default" into lmp-sprout-devGriff Hazen2014-10-201-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Disable zen log printouts by defaultGriff Hazen2014-10-201-1/+2
* | | | | | | | | | | | | | | | am 33bb6c2d: Merge "Remove spammy log information for BLE scan." into lmp-spr...Wei Wang2014-10-201-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /