summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge "Expose CommandRequest completion status."Johnson Hsieh2015-01-211-3/+9
|\
| * Expose CommandRequest completion status.Johnson Hsieh2015-01-201-3/+9
* | am 00959a56: am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-de...Jinsuk Kim2015-01-201-1/+6
|\ \
| * \ am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-devJinsuk Kim2015-01-201-1/+6
| |\ \
| | * \ am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-devJinsuk Kim2015-01-201-1/+6
| | |\ \
| | | * \ Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-devJinsuk Kim2015-01-201-1/+6
| | | |\ \
| | | | * | Mark TimeUnit as @SystemApiJinsuk Kim2015-01-211-1/+6
| | | * | | Import translations. DO NOT MERGEGeoff Mendal2015-01-191-2/+2
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-01-196-481/+481
| * | | | | am b5108949: am e4a031e3: Merge "New trick to install bad dex file."Ying Wang2015-01-201-2/+3
| |\ \ \ \ \
| | * | | | | New trick to install bad dex file.Ying Wang2015-01-201-2/+3
* | | | | | | Merge "Use activated control color for ripple checked state"Alan Viverette2015-01-205-8/+56
|\ \ \ \ \ \ \
| * | | | | | | Use activated control color for ripple checked stateAlan Viverette2015-01-205-8/+56
* | | | | | | | Merge "Fix NPE in ActionMenuView when there isn't a presenter"Chris Banes2015-01-201-4/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix NPE in ActionMenuView when there isn't a presenterChris Banes2015-01-191-4/+7
* | | | | | | | | Merge "Move Canvas"John Reck2015-01-204-744/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move CanvasJohn Reck2015-01-204-744/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge "New trick to install bad dex file."Ying Wang2015-01-201-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | New trick to install bad dex file.Ying Wang2015-01-141-2/+3
* | | | | | | | | | Merge "Don't read float from parcel"Todd Kennedy2015-01-201-8/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't read float from parcelTodd Kennedy2015-01-201-8/+9
* | | | | | | | | | | Expose new binder call createStackOnDisplay()Todd Kennedy2015-01-202-0/+36
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | am 77e7f401: am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build."Neil Fuller2015-01-201-9/+10
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build."Neil Fuller2015-01-201-9/+10
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Fix for broken docs build."Neil Fuller2015-01-201-9/+10
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix for broken docs build.Neil Fuller2015-01-201-9/+10
* | | | | | | | | | | am 7014da74: resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aospNeil Fuller2015-01-202-50/+60
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aospNeil Fuller2015-01-202-50/+60
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Changes associated with an OkHttp upgrade"Neil Fuller2015-01-202-50/+60
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Changes associated with an OkHttp upgradeNeil Fuller2015-01-202-50/+60
* | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-01-199-496/+496
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-01-199-496/+496
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | am 66bbfb6b: am 17f50f81: am d8beca64: Merge "Remove support for --classpath ...Narayan Kamath2015-01-193-125/+20
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 17f50f81: am d8beca64: Merge "Remove support for --classpath and make --ru...Narayan Kamath2015-01-193-125/+20
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Remove support for --classpath and make --runtime-init the default.Narayan Kamath2015-01-193-125/+20
* | | | | | | | | | | am 1f7d657b: am 3e809794: am e315feea: Merge "Fix handling of wrapped process...Narayan Kamath2015-01-191-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | / / / / / / / / | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | am 3e809794: am e315feea: Merge "Fix handling of wrapped processes [part 1]."Narayan Kamath2015-01-191-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Fix handling of wrapped processes [part 1].Narayan Kamath2015-01-191-0/+2
* | | | | | | | | | am e05f269b: am 96b87a1d: am 4ac5775d: Merge "Fix handling of wrapped process...Narayan Kamath2015-01-191-12/+24
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 96b87a1d: am 4ac5775d: Merge "Fix handling of wrapped processes [part 2]"Narayan Kamath2015-01-191-12/+24
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Fix handling of wrapped processes [part 2]Narayan Kamath2015-01-161-12/+24
* | | | | | | | | | Merge "Ensure spinner variables are initialized correctly"Alan Viverette2015-01-162-72/+97
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Ensure spinner variables are initialized correctlyAlan Viverette2015-01-162-72/+97
* | | | | | | | | | | am 605ba802: am 2004fdf8: am 830f39ad: Merge "Fixing a memory leak: activitie...Svet Ganov2015-01-161-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 2004fdf8: am 830f39ad: Merge "Fixing a memory leak: activities are leaked....Svet Ganov2015-01-161-0/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | am 830f39ad: Merge "Fixing a memory leak: activities are leaked." into lmp-mr...Svet Ganov2015-01-161-0/+3
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-devSvet Ganov2015-01-161-0/+3
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | | | * | | | | | | Fixing a memory leak: activities are leaked.Svet Ganov2015-01-161-0/+3
* | | | | | | | | | | am 62e815bf: am 02c7c97a: am ac70b2d1: Merge "More debugging for bug 18201239...Craig Mautner2015-01-161-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | / / / / / / | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | am 02c7c97a: am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-m...Craig Mautner2015-01-161-0/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /