summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* am 97b2bc9a: Merge "camera2: Change CaptureListener callbacks to include the ...Igor Murashkin2014-06-041-7/+7
|\
| * Merge "camera2: Change CaptureListener callbacks to include the session (api)...Igor Murashkin2014-06-041-7/+7
| |\
| | * camera2: Change CaptureListener callbacks to include the session (api)Igor Murashkin2014-06-041-7/+7
| * | DO NOT MERGE Redact SyncService stuff from masterMatthew Williams2014-06-041-18/+0
| |/
* | am 37532379: Merge "DNG: Hide unimplemented methods." into lmp-preview-devRuben Brunk2014-06-041-7/+0
|\ \ | |/
| * Merge "DNG: Hide unimplemented methods." into lmp-preview-devRuben Brunk2014-06-041-7/+0
| |\
| | * DNG: Hide unimplemented methods.Ruben Brunk2014-06-041-7/+0
| * | Hide TrustAgentService in lmp-preview - DO NOT MERGEAdrian Roos2014-06-041-15/+0
| |/
* | Merge "Redact SyncService stuff from master"Matthew Williams2014-06-041-18/+0
|\ \
| * | Redact SyncService stuff from masterMatthew Williams2014-06-041-18/+0
* | | am 1604d630: Merge "Fix action bar menu inflation context" into lmp-preview-devAlan Viverette2014-06-041-135/+136
|\ \ \ | | |/ | |/|
| * | Fix action bar menu inflation contextAlan Viverette2014-06-031-135/+136
* | | Merge commit '096d52fb' into manualmergeAlan Viverette2014-06-041-625/+52
|\ \ \ | |/ / | | / | |/ |/|
| * Merge "Update theme colors, fix EditText state transition" into lmp-preview-devAlan Viverette2014-06-031-38/+37
| |\
| | * Update theme colors, fix EditText state transitionAlan Viverette2014-06-031-38/+37
| * | Merge "Revert sendEnvelope changes [DO NOT MERGE]" into lmp-preview-devEvan Charlton2014-06-031-5/+0
| |\ \ | | |/ | |/|
| | * Revert sendEnvelope changes [DO NOT MERGE]Evan Charlton2014-05-291-5/+0
* | | Merge "Ignore inPurgeable and inInputShareable."Leon Scroggins III2014-06-041-2/+2
|\ \ \
| * | | Ignore inPurgeable and inInputShareable.Leon Scroggins III2014-06-031-2/+2
* | | | Merge "Remove enableSystemApp() and enableSystemAppWithInten()."Sander Alewijnse2014-06-041-2/+0
|\ \ \ \
| * | | | Remove enableSystemApp() and enableSystemAppWithInten().Sander Alewijnse2014-05-271-2/+0
* | | | | Add missing #isSpeaking to TTS API V2Przemyslaw Szczepaniak2014-06-041-0/+1
* | | | | am 594ac157: Merge "TvContract: Address the feedback from the API review" int...Jae Seo2014-06-031-12/+28
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "TvContract: Address the feedback from the API review" into lmp-preview...Jae Seo2014-06-031-12/+28
| |\ \ \ \
| | * | | | TvContract: Address the feedback from the API reviewJae Seo2014-06-021-12/+28
* | | | | | am b9c0a8ae: Merge "Add a way to get the class name of SetupActivity and Sett...Chulwoo Lee2014-06-031-1/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Add a way to get the class name of SetupActivity and SettingsActivity"...Chulwoo Lee2014-06-021-1/+5
| |\ \ \ \ \
| | * | | | | Add a way to get the class name of SetupActivity and SettingsActivityChulwoo Lee2014-06-031-1/+5
| | |/ / / /
* | | | | | am 25931ade: Merge "Clean up drawable theming APIs" into lmp-preview-devAlan Viverette2014-06-031-7/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Clean up drawable theming APIs" into lmp-preview-devAlan Viverette2014-06-021-7/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Clean up drawable theming APIsAlan Viverette2014-06-021-7/+2
* | | | | | Merge "Adding user consent extras to DevicePolicyManager."Nicolas Prevot2014-06-031-0/+1
|\ \ \ \ \ \
| * | | | | | Adding user consent extras to DevicePolicyManager.Nicolas Prevot2014-06-031-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | resolved conflicts for merge of ebe661c4 to masterJae Seo2014-06-031-154/+154
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge "Put TV Input Framework under android.media.tv, including TvContract" i...Jae Seo2014-06-021-154/+154
| |\ \ \ \
| | * | | | Put TV Input Framework under android.media.tv, including TvContractJae Seo2014-06-021-154/+154
| | |/ / /
| * | | | Merge "DO NOT MERGE: Accomoditing API Review feedback for WifiScanner" into l...Vinit Deshpande2014-06-021-80/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | DO NOT MERGE: Accomoditing API Review feedback for WifiScannerVinit Deshpande2014-05-301-80/+0
* | | | | Fix buildAlan Viverette2014-06-011-1/+1
* | | | | Merge commit '6682183b' into manualmergeAlan Viverette2014-06-011-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Fixes hotspot list transitions, update to use a single hotspotAlan Viverette2014-06-011-0/+2
* | | | | Restrictions ManagerAmith Yamasani2014-05-311-0/+31
* | | | | Allow ConnectionService to ask Telecomm for ringbackIhab Awad2014-05-311-0/+6
* | | | | am d6f7d9b7: Merge "Clean up voice API." into lmp-preview-devDianne Hackborn2014-05-311-2/+9
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Clean up voice API." into lmp-preview-devDianne Hackborn2014-05-301-2/+9
| |\ \ \ \
| | * | | | Clean up voice API.Dianne Hackborn2014-05-301-2/+9
* | | | | | am 9a78d4de: Merge "Per-app media directories on external storage." into lmp-...Jeff Sharkey2014-05-301-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Per-app media directories on external storage." into lmp-preview-devJeff Sharkey2014-05-301-0/+3
| |\ \ \ \ \
| | * | | | | Per-app media directories on external storage.Jeff Sharkey2014-05-301-0/+3
* | | | | | | am 338382de: Merge "Fix action bar title TextAppearance usage for Toolbar dec...Adam Powell2014-05-301-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
generated by cgit v1.1 at 2025-01-14 23:39:17 +0000