summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-devJason Monk2014-12-111-3/+5
|\
| * Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-devJason Monk2014-12-111-3/+5
| |\
| | * Fix crash in BluetoothControllerImplJason Monk2014-12-111-3/+5
* | | am c5da1d3d: Merge "Adding new config variable that is used to determine if E...Amit Mahajan2014-12-112-1/+4
|\ \ \ | |/ /
| * | Merge "Adding new config variable that is used to determine if ERI should be ...Amit Mahajan2014-12-112-1/+4
| |\ \
| | * | Adding new config variable that is used to determine if ERI should beAmit Mahajan2014-12-052-1/+4
* | | | am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume c...John Spurlock2014-12-111-1/+4
|\ \ \ \ | |/ / /
| * | | Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into...John Spurlock2014-12-111-1/+4
| |\ \ \
| | * | | Zen: Leave zen=none on manual ringer mode stream volume changes.John Spurlock2014-12-111-1/+4
* | | | | am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-devRobert Greenwalt2014-12-111-0/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add toString in NetworkFactory." into lmp-mr1-devRobert Greenwalt2014-12-111-0/+8
| |\ \ \ \
| | * | | | Add toString in NetworkFactory.Robert Greenwalt2014-12-101-0/+8
* | | | | | Merge "Fixed a bug where the pattern may become invisible" into lmp-mr1-devSelim Cinek2014-12-111-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fixed a bug where the pattern may become invisible" into lmp-mr1-devSelim Cinek2014-12-111-0/+1
| |\ \ \ \ \
| | * | | | | Fixed a bug where the pattern may become invisibleSelim Cinek2014-12-101-0/+1
* | | | | | | Merge "Fixed a bug where the empty shade and dismiss views would animate" int...Selim Cinek2014-12-111-4/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fixed a bug where the empty shade and dismiss views would animate" int...Selim Cinek2014-12-111-4/+10
| |\ \ \ \ \ \
| | * | | | | | Fixed a bug where the empty shade and dismiss views would animateSelim Cinek2014-12-101-4/+10
* | | | | | | | Merge "Fixed a bug where the background could become transparent" into lmp-mr...Selim Cinek2014-12-111-16/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fixed a bug where the background could become transparent" into lmp-mr...Selim Cinek2014-12-111-16/+17
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fixed a bug where the background could become transparentSelim Cinek2014-12-101-16/+17
* | | | | | | | am 15cd6302: Merge "Avoid tearing down process groups twice." into lmp-mr1-devNarayan Kamath2014-12-111-3/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Avoid tearing down process groups twice." into lmp-mr1-devNarayan Kamath2014-12-111-3/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Avoid tearing down process groups twice.Narayan Kamath2014-12-101-3/+5
* | | | | | | | | am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into...Paul Jensen2014-12-117-42/+139
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-devPaul Jensen2014-12-117-42/+139
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix several HTTP proxy issues with multinetworking.Paul Jensen2014-12-107-42/+139
* | | | | | | | | | am fda0ff02: Merge "Add missing member to string conversion - helps in debugg...Pavel Zhamaitsiak2014-12-111-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Add missing member to string conversion - helps in debugging." into lm...Pavel Zhamaitsiak2014-12-111-0/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add missing member to string conversion - helps in debugging.Etan Cohen2014-12-101-0/+1
* | | | | | | | | | | am b897f013: Merge "adjust network switching thresholds Bug:18589301" into lm...vandwalle2014-12-112-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-devvandwalle2014-12-112-0/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | adjust network switching thresholdsvandwalle2014-12-092-0/+4
| | | |/ / / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | am 9a6d1d9f: am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 p...smain@google.com2014-12-1140-38/+81
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lm...smain@google.com2014-12-1140-38/+81
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lm...smain@google.com2014-12-1040-38/+81
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docssmain@google.com2014-12-1040-38/+81
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge "add helpouts widget to wave 3 pages" into lmp-docssmain@google.com2014-12-1040-38/+81
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | add helpouts widget to wave 3 pagessmain@google.com2014-12-1040-38/+81
* | | | | | | | | | | | | | | am 25964a85: am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studi...Luan Nguyen2014-12-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index.Luan Nguyen2014-12-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index.Luan Nguyen2014-12-101-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | am 4221d7e4: docs: Fix link for moved Android Studio index.Luan Nguyen2014-12-101-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | docs: Fix link for moved Android Studio index.Luan Nguyen2014-12-101-1/+1
* | | | | | | | | | | | | | | am 84adc43a: Merge "Fix issue #18706195: Improve label names of memory types"...Dianne Hackborn2014-12-111-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1...Dianne Hackborn2014-12-111-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fix issue #18706195: Improve label names of memory typesDianne Hackborn2014-12-101-4/+4
* | | | | | | | | | | | | | | | am eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-devJohn Reck2014-12-1111-73/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "Don't preload textures for AssetAtlas" into lmp-mr1-devJohn Reck2014-12-1111-73/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Don't preload textures for AssetAtlasJohn Reck2014-12-1011-73/+75