summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add Icon support to ImageView.Dan Sandler2015-05-134-0/+59
* Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-05-143-0/+70
|\
| * Import translations. DO NOT MERGEGeoff Mendal2015-05-133-0/+70
* | Merge "fix null pointer crash" into mnc-devVinit Deshpande2015-05-141-1/+1
|\ \
| * | fix null pointer crashPierre Vandwalle2015-05-131-1/+1
* | | Merge "Only activate the wifi alternate reality hack for KK and lower" into m...Lorenzo Colitti2015-05-141-2/+2
|\ \ \ | |_|/ |/| |
| * | Only activate the wifi alternate reality hack for KK and lowerLorenzo Colitti2015-05-131-2/+2
* | | Merge "AudioTrack in SoundPool uses audio_attributes_t parameter" into mnc-devJean-Michel Trivi2015-05-141-2/+6
|\ \ \
| * | | AudioTrack in SoundPool uses audio_attributes_t parameterJean-Michel Trivi2015-05-131-2/+6
* | | | Merge "DO NOT MERGE - Overlay display now support multiple modes." into mnc-devJeff Brown2015-05-142-76/+217
|\ \ \ \
| * | | | DO NOT MERGE - Overlay display now support multiple modes.P.Y. Laligand2015-05-132-76/+217
* | | | | Merge "Hotspot 2.0 UI." into mnc-devSanket Padawe2015-05-142-0/+5
|\ \ \ \ \
| * | | | | Hotspot 2.0 UI.Sanket Padawe2015-05-122-0/+5
* | | | | | Merge "Add getChannelIndexMasks API to AudioDeviceInfo" into mnc-devAndy Hung2015-05-143-9/+27
|\ \ \ \ \ \
| * | | | | | Add getChannelIndexMasks API to AudioDeviceInfoAndy Hung2015-05-133-9/+27
* | | | | | | Merge "TIF: Add DVB device handling to TvInputManagerService" into mnc-devJaesung Chung2015-05-146-0/+268
|\ \ \ \ \ \ \
| * | | | | | | TIF: Add DVB device handling to TvInputManagerServiceJaesung Chung2015-05-146-0/+268
* | | | | | | | Merge "Improve javadoc for PRESENTATION_ constants." into mnc-devSantos Cordon2015-05-141-4/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve javadoc for PRESENTATION_ constants.Santos Cordon2015-05-131-4/+12
* | | | | | | | | Merge "[1/4] Use new Icon class in PhoneAccount." into mnc-devSantos Cordon2015-05-144-212/+126
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [1/4] Use new Icon class in PhoneAccount.Santos Cordon2015-05-134-212/+126
| |/ / / / / / / /
* | | | | | | | | Merge "Add BIND_TELECOM_CONNECTION_SERVICE permission" into mnc-devYorke Lee2015-05-144-4/+15
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Add BIND_TELECOM_CONNECTION_SERVICE permissionYorke Lee2015-05-134-4/+15
* | | | | | | | | Merge "Do not allow opting out from the new permission model." into mnc-devSvetoslav2015-05-143-0/+27
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Do not allow opting out from the new permission model.Svetoslav2015-05-133-0/+27
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "Don't stop animation when starting windows app token changes" into mnc...Wale Ogunwale2015-05-143-90/+109
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't stop animation when starting windows app token changesWale Ogunwale2015-05-133-90/+109
* | | | | | | | | Merge "Update the new error reporting API in android.webkit" into mnc-devMikhail Naganov2015-05-146-76/+75
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update the new error reporting API in android.webkitMikhail Naganov2015-05-136-76/+75
* | | | | | | | | | Merge "Allow settings to change app inactive state" into mnc-devAmith Yamasani2015-05-142-1/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Allow settings to change app inactive stateAmith Yamasani2015-05-132-1/+13
* | | | | | | | | | Merge "Add IntentFilter auto verification - part 11" into mnc-devFabrice Di Meglio2015-05-141-5/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add IntentFilter auto verification - part 11Fabrice Di Meglio2015-05-131-5/+7
* | | | | | | | | | | Merge "Rename AudioState to CallAudioState" into mnc-devYorke Lee2015-05-1415-81/+479
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Rename AudioState to CallAudioStateYorke Lee2015-05-1315-81/+479
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Add QS Tuner" into mnc-devJason Monk2015-05-149-15/+591
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add QS TunerJason Monk2015-05-139-15/+591
* | | | | | | | | | | Ignore small time changes in alarm manager.Dianne Hackborn2015-05-132-87/+94
* | | | | | | | | | | am 7238435e: (-s ours) resolved conflicts for merge of e869835d to lmp-mr1-ub...John Reck2015-05-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of e869835d to lmp-mr1-ub-devJohn Reck2015-05-1327-116/+805
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am a5b28b92: am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracki...John Reck2015-05-1327-116/+805
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracking metrics" i...John Reck2015-05-1327-116/+805
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-devJohn Reck2015-05-1327-116/+805
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | DO NOT MERGE Backport of limited jank-tracking metricsJohn Reck2015-03-1827-116/+805
* | | | | | | | | | | | | | | | Merge "Fix build." into mnc-devDianne Hackborn2015-05-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix build.Dianne Hackborn2015-05-131-0/+1
* | | | | | | | | | | | | | | | | Merge "Fix fingerprint for multiuser" into mnc-devJorim Jaggi2015-05-143-53/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix fingerprint for multiuserJorim Jaggi2015-05-133-53/+49
* | | | | | | | | | | | | | | | | | Merge "Allow partial playback parameter settings in AudioTrack" into mnc-devAndy Hung2015-05-141-10/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Allow partial playback parameter settings in AudioTrackAndy Hung2015-05-131-10/+32