summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Lockup in the print spooler.Svet Ganov2014-11-244-13/+33
* Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-devAlan Viverette2014-11-241-1/+1
|\
| * Check for null drawable in theme-less getDrawable()Alan Viverette2014-11-241-1/+1
* | Merge "Add support for audio focus locking" into lmp-mr1-devJean-Michel Trivi2014-11-245-44/+166
|\ \
| * | Add support for audio focus lockingJean-Michel Trivi2014-11-245-44/+166
* | | Merge "Don't enforce control permission when preparing consented VPN." into l...Jeff Davidson2014-11-242-52/+47
|\ \ \
| * | | Don't enforce control permission when preparing consented VPN.Jeff Davidson2014-11-212-52/+47
* | | | Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-devJinsuk Kim2014-11-242-20/+17
|\ \ \ \
| * | | | CEC: Do not issue non-effective <Routing Change>Jinsuk Kim2014-11-242-20/+17
* | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-11-243-5/+5
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-243-5/+5
* | | | | | Merge "Introduce revision codes for split APKs." into lmp-mr1-devJeff Sharkey2014-11-2410-36/+175
|\ \ \ \ \ \
| * | | | | | Introduce revision codes for split APKs.Jeff Sharkey2014-11-2410-36/+175
* | | | | | | Merge "Add system API to get registered connection managers" into lmp-mr1-devSailesh Nepal2014-11-241-0/+10
|\ \ \ \ \ \ \
| * | | | | | | Add system API to get registered connection managersSailesh Nepal2014-11-211-0/+10
* | | | | | | | Merge "Fix quick settings on Keyguard" into lmp-mr1-devJorim Jaggi2014-11-243-13/+54
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix quick settings on KeyguardJorim Jaggi2014-11-243-13/+54
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge "LED should not be blocked by interruption filtering." into lmp-mr1-devChris Wren2014-11-241-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | LED should not be blocked by interruption filtering.Chris Wren2014-11-241-3/+3
* | | | | | | | | am 75cd7c74: am 5f3ba993: am 1b23ee96: Merge "add intro videos (w/ shadowbox)...smain@google.com2014-11-242-10/+13
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | am 5f3ba993: am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and ...smain@google.com2014-11-242-10/+13
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing ...smain@google.com2014-11-242-10/+13
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into ...smain@google.com2014-11-242-10/+13
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | add intro videos (w/ shadowbox) to Auto and Wear landing pages.smain@google.com2014-11-242-10/+13
* | | | | | | | | | | | Merge "QS: Update data usage over limit title." into lmp-mr1-devJohn Spurlock2014-11-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | QS: Update data usage over limit title.John Spurlock2014-11-241-1/+1
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Don't bother validating networks that don't satisfy the default reques...Paul Jensen2014-11-243-12/+30
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't bother validating networks that don't satisfy the default request.Paul Jensen2014-11-203-12/+30
* | | | | | | | | | | | | am 3a013dab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-spr...Geoff Mendal2014-11-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-sprout-devGeoff Mendal2014-11-244-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-244-7/+7
* | | | | | | | | | | | | | Merge "Print spooler crash when printing after a rotation." into lmp-mr1-devSvet Ganov2014-11-243-71/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Print spooler crash when printing after a rotation.Svet Ganov2014-11-223-71/+109
* | | | | | | | | | | | | | | Merge "Set network selection to automatic when in Global mode" into lmp-mr1-devAmit Mahajan2014-11-245-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Set network selection to automatic when in Global modea200232014-11-245-1/+7
* | | | | | | | | | | | | | | | am 2b36a86b: Wire up surface width/height to lockHardwareCanvas DO NOT MERGEJohn Reck2014-11-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Wire up surface width/height to lockHardwareCanvas DO NOT MERGEJohn Reck2014-11-242-3/+26
* | | | | | | | | | | | | | | | Merge "Final resource IDs." into lmp-mr1-devDianne Hackborn2014-11-242-20/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Final resource IDs.Dianne Hackborn2014-11-212-20/+12
* | | | | | | | | | | | | | | | | Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1...Dianne Hackborn2014-11-247-77/+193
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Work on issue #18486438: Reduce size of bugreport outputDianne Hackborn2014-11-217-77/+193
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | am 3d110b23: Make WallpaperService watch the actual display state.Jeff Brown2014-11-242-31/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Make WallpaperService watch the actual display state.Jeff Brown2014-11-222-31/+41
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Delete unused/non-working code." into lmp-mr1-devSreeram Ramachandran2014-11-243-134/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Delete unused/non-working code.Sreeram Ramachandran2014-11-213-134/+0
* | | | | | | | | | | | | | | | | Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-devSreeram Ramachandran2014-11-246-11/+146
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Allow VPNs to specify their underlying networks.Sreeram Ramachandran2014-11-216-11/+146
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr...Sreeram Ramachandran2014-11-244-179/+134
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Eliminate race conditions in UID-based network filtering.Sreeram Ramachandran2014-11-214-179/+134
* | | | | | | | | | | | | | | | | Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-devJorim Jaggi2014-11-244-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \