summaryrefslogtreecommitdiffstats
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* Merge "Remove enableSystemApp() and enableSystemAppWithInten()."Sander Alewijnse2014-06-042-42/+0
|\
| * Remove enableSystemApp() and enableSystemAppWithInten().Sander Alewijnse2014-05-272-42/+0
* | Add missing #isSpeaking to TTS API V2Przemyslaw Szczepaniak2014-06-041-24/+65
* | Merge "Add API definition for WebSettings.setVideoOverlayForEmbeddedEncrypted...Yuncheol Heo2014-06-041-0/+32
|\ \
| * | Add API definition for WebSettings.setVideoOverlayForEmbeddedEncryptedVideoEn...Yuncheol Heo2014-05-231-0/+32
* | | am 25931ade: Merge "Clean up drawable theming APIs" into lmp-preview-devAlan Viverette2014-06-034-8/+19
|\ \ \
| * \ \ Merge "Clean up drawable theming APIs" into lmp-preview-devAlan Viverette2014-06-024-8/+19
| |\ \ \
| | * | | Clean up drawable theming APIsAlan Viverette2014-06-024-8/+19
* | | | | am da4a186f: Merge "Some battery stats history fixes." into lmp-preview-devDianne Hackborn2014-06-031-0/+9
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Some battery stats history fixes." into lmp-preview-devDianne Hackborn2014-06-021-0/+9
| |\ \ \ \
| | * | | | Some battery stats history fixes.Dianne Hackborn2014-06-021-0/+9
* | | | | | am 5a745332: Merge "Delay sending shared element position until after layout....George Mount2014-06-033-3/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Delay sending shared element position until after layout." into lmp-pr...George Mount2014-06-023-3/+28
| |\ \ \ \ \
| | * | | | | Delay sending shared element position until after layout.George Mount2014-06-023-3/+28
* | | | | | | am ef7c0948: Merge "Add an internal method for setting optical insets." into ...Adam Powell2014-06-031-0/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Add an internal method for setting optical insets." into lmp-preview-devAdam Powell2014-06-021-0/+14
| |\ \ \ \ \ \
| | * | | | | | Add an internal method for setting optical insets.Adam Powell2014-06-021-0/+14
* | | | | | | | Merge "Adding user consent extras to DevicePolicyManager."Nicolas Prevot2014-06-031-0/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Adding user consent extras to DevicePolicyManager.Nicolas Prevot2014-06-031-0/+18
* | | | | | | | | resolved conflicts for merge of ebe661c4 to masterJae Seo2014-06-0321-3542/+5
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge "Put TV Input Framework under android.media.tv, including TvContract" i...Jae Seo2014-06-0221-3542/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Put TV Input Framework under android.media.tv, including TvContractJae Seo2014-06-0221-3542/+5
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Merge "Remove GLRenderer"John Reck2014-06-039-1739/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove GLRendererJohn Reck2014-06-029-1739/+19
* | | | | | | | | | Merge "Add an --abi argument to "pm install""Narayan Kamath2014-06-031-0/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add an --abi argument to "pm install"Narayan Kamath2014-06-031-0/+7
* | | | | | | | | | | Fix Legacy NetworkInfo APIRobert Greenwalt2014-06-034-20/+33
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Finish migration of backup transport constantsChristopher Tate2014-06-021-2/+2
* | | | | | | | | | Merge "Add full-backup stream API to BackupTransport"Christopher Tate2014-06-031-47/+128
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add full-backup stream API to BackupTransportChristopher Tate2014-06-021-47/+128
* | | | | | | | | | | Merge "Refactor NetworkFactory."Robert Greenwalt2014-06-034-345/+342
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Refactor NetworkFactory.Robert Greenwalt2014-06-024-345/+342
* | | | | | | | | | | | Merge "Added missing entries in the cec device array"Jinsuk Kim2014-06-021-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Added missing entries in the cec device arrayJinsuk Kim2014-06-021-0/+4
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Rewrite startUsingNetworkFeature for new API"Robert Greenwalt2014-06-022-16/+207
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Rewrite startUsingNetworkFeature for new APIRobert Greenwalt2014-05-272-16/+207
* | | | | | | | | | | | am f3c294df: Merge "Code cleaning" into lmp-preview-devFabrice Di Meglio2014-06-021-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | / / / / / / / | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge "Code cleaning" into lmp-preview-devFabrice Di Meglio2014-06-021-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| | * | | | | | | | | Code cleaningFabrice Di Meglio2014-05-301-3/+3
* | | | | | | | | | | am feccbdc4: Merge "Add setStartValue to RNA" into lmp-preview-devJohn Reck2014-06-021-3/+13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | / / / / / / / | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add setStartValue to RNAJohn Reck2014-06-021-3/+13
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge "DO NOT MERGE: Register HdmiControlService" into lmp-preview-devJungshik Jang2014-06-021-0/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | DO NOT MERGE: Register HdmiControlServiceJinsuk Kim2014-06-021-0/+7
| * | | | | | | | | Merge "DO NOT MERGE: Stop publishing HdmiCecService, start publishing HdmiCon...Jungshik Jang2014-06-022-40/+8
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | DO NOT MERGE: Stop publishing HdmiCecService, start publishing HdmiControlSer...Jinsuk Kim2014-06-022-40/+8
| * | | | | | | | | Merge "DO NOT MERGE: Fix a couple of bugs in CEC services" into lmp-preview-devJungshik Jang2014-06-021-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | DO NOT MERGE: Fix a couple of bugs in CEC servicesJinsuk Kim2014-06-021-1/+1
| * | | | | | | | | Merge "DO NOT MERGE: Fix a bug calling a wrong HDMI-CEC Binder API" into lmp-...Jungshik Jang2014-06-021-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | DO NOT MERGE: Fix a bug calling a wrong HDMI-CEC Binder APIJinsuk Kim2014-06-021-1/+1
| * | | | | | | | | Merge "DO NOT MERGE: Add the constants for the callback result of SendCecComm...Jungshik Jang2014-06-021-3/+34
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /