summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-devAdrian Roos2015-10-161-9/+9
|\
| * Merge "Fix wrongly laid out navigation color view" into mnc-dr-devAdrian Roos2015-10-161-9/+9
| |\
| | * Fix wrongly laid out navigation color viewAdrian Roos2015-10-151-9/+9
* | | am a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mn...Julia Reynolds2015-10-161-23/+48
|\ \ \ | |/ /
| * | Merge "Add 'until next alarm' option to QS zen panel." into mnc-dr-devJulia Reynolds2015-10-161-23/+48
| |\ \
| | * | Add 'until next alarm' option to QS zen panel.Julia Reynolds2015-10-151-23/+48
| | |/
* | | am 749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-devAdam Powell2015-10-161-1/+1
|\ \ \ | |/ /
| * | Fix ChooserTarget app scoringAdam Powell2015-10-161-1/+1
* | | am 9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance...Abodunrinwa Toki2015-10-162-6/+4
|\ \ \ | |/ /
| * | Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-d...Abodunrinwa Toki2015-10-162-6/+4
| |\ \
| | * | DO NOT MERGE: Reduce delay of floating toolbar appearance.Abodunrinwa Toki2015-10-162-6/+4
| | |/
* | | am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-devJeff Sharkey2015-10-162-261/+392
|\ \ \ | |/ /
| * | Merge "Update docs to reflect adoptable behavior." into mnc-dr-devJeff Sharkey2015-10-162-261/+392
| |\ \
| | * | Update docs to reflect adoptable behavior.Jeff Sharkey2015-10-142-261/+392
* | | | am be655510: Merge "Disassociate system windows from apps" into mnc-dr-devWale Ogunwale2015-10-161-8/+21
|\ \ \ \ | |/ / /
| * | | Merge "Disassociate system windows from apps" into mnc-dr-devWale Ogunwale2015-10-161-8/+21
| |\ \ \ | | |_|/ | |/| |
| | * | Disassociate system windows from appstiger_huang2015-10-161-8/+21
* | | | am ae5a53d7: Merge "Update volume slider on device changed." into mnc-dr-devJulia Reynolds2015-10-151-7/+16
|\ \ \ \ | |/ / /
| * | | Merge "Update volume slider on device changed." into mnc-dr-devJulia Reynolds2015-10-151-7/+16
| |\ \ \
| | * | | Update volume slider on device changed.Julia Reynolds2015-10-141-7/+16
| | | |/ | | |/|
* | | | am 75765dbe: am e34445f1: Merge "Docs only change: update build version docs....Dianne Hackborn2015-10-151-4/+30
|\ \ \ \ | |/ / /
| * | | am e34445f1: Merge "Docs only change: update build version docs." into mnc-devDianne Hackborn2015-10-151-4/+30
| |\ \ \
| | * \ \ Merge "Docs only change: update build version docs." into mnc-devDianne Hackborn2015-10-151-4/+30
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Docs only change: update build version docs.Dianne Hackborn2015-09-241-4/+30
* | | | | am 63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-devRoozbeh Pournader2015-10-152-11/+26
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Load binary hyphen data files" into mnc-dr-devRoozbeh Pournader2015-10-152-11/+26
| |\ \ \ \
| | * | | | Load binary hyphen data filesRaph Levien2015-10-142-11/+26
| | | |_|/ | | |/| |
* | | | | am 2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-devAdam Powell2015-10-141-7/+18
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-devAdam Powell2015-10-141-7/+18
| |\ \ \ \
| | * | | | Fix bugs introduced in ChooserActivityAdam Powell2015-10-141-7/+18
| | |/ / /
* | | | | am bdf952aa: Merge "Make Hyphenator#get() return an object." into mnc-dr-devRoozbeh Pournader2015-10-142-6/+11
|\ \ \ \ \ | |/ / / /
| * | | | Make Hyphenator#get() return an object.Roozbeh Pournader2015-10-142-6/+11
| |/ / /
* | | | am 11af1878: Merge "Add animation and positional stability to intent chooser ...Adam Powell2015-10-123-57/+335
|\ \ \ \ | |/ / /
| * | | Merge "Add animation and positional stability to intent chooser UI" into mnc-...Adam Powell2015-10-123-57/+335
| |\ \ \
| | * | | Add animation and positional stability to intent chooser UIAdam Powell2015-10-023-57/+335
* | | | | am 34c120dc: Merge ""Fix" issue #24357296: Debug.getMemoryInfo doesn\'t inclu...Dianne Hackborn2015-10-121-2/+8
|\ \ \ \ \ | |/ / / /
| * | | | "Fix" issue #24357296: Debug.getMemoryInfo doesn't include EGL mtrack...Dianne Hackborn2015-10-121-2/+8
* | | | | am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_I...Alan Viverette2015-10-121-2/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" int...Alan Viverette2015-10-121-2/+8
| |\ \ \ \
| | * | | | Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATORAlan Viverette2015-10-051-2/+8
* | | | | | am a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-...Jeff Sharkey2015-10-121-24/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Push firewall rules up to ConnectivityService." into mnc-dr-devJeff Sharkey2015-10-121-24/+4
| |\ \ \ \ \
| | * | | | | Push firewall rules up to ConnectivityService.Jeff Sharkey2015-09-141-24/+4
* | | | | | | am fe45f1b9: Merge "Default location is "internalOnly" when undefined." into ...Jeff Sharkey2015-10-121-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Default location is "internalOnly" when undefined." into mnc-dr-devJeff Sharkey2015-10-121-1/+2
| |\ \ \ \ \ \
| | * | | | | | Default location is "internalOnly" when undefined.Jeff Sharkey2015-10-091-1/+2
* | | | | | | | am 4e4d59ee: Connect the DHCP UDP socket to the server.Lorenzo Colitti2015-10-111-5/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Connect the DHCP UDP socket to the server.Lorenzo Colitti2015-10-111-5/+4
| |/ / / / / /
* | | | | | | Merge "Give Android Wear system apps default permission" into cw-e-devAnthony Hugh2015-10-091-0/+7
|\ \ \ \ \ \ \
| * | | | | | | Give Android Wear system apps default permissionAnthony Hugh2015-10-081-0/+7