summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* am 133c1faf: am 67d7af51: am 19565ad1: Merge "Small print API tweaks" into kl...Svetoslav2013-10-041-8/+1
|\
| * Merge "Small print API tweaks" into klp-devSvetoslav2013-10-041-8/+1
| |\
| | * Small print API tweaksSvetoslav2013-10-041-8/+1
* | | am 0d9ff161: am 538df343: am 331f9e79: Merge "Print attributes hint not honor...Svetoslav Ganov2013-10-041-1/+1
|\ \ \ | |/ /
| * | Merge "Print attributes hint not honored." into klp-devSvetoslav Ganov2013-10-041-1/+1
| |\ \
| | * | Print attributes hint not honored.Svetoslav Ganov2013-10-041-1/+1
| | |/
* | | am 849ef427: am 2bbf0bfc: am 0ab7c883: Merge "Add Consumer IR feature" into k...Alex Ray2013-10-041-0/+1
|\ \ \ | |/ /
| * | Merge "Add Consumer IR feature" into klp-devAlex Ray2013-10-041-0/+1
| |\ \
| | * | Add Consumer IR featureAlex Ray2013-10-031-0/+1
* | | | am 1db7024c: am 2e23484e: am f3f1a370: Merge "Un-deprecate getDhcpInfo" into ...Robert Greenwalt2013-10-041-2/+2
|\ \ \ \ | |/ / /
| * | | Un-deprecate getDhcpInfoRobert Greenwalt2013-10-041-2/+2
| | |/ | |/|
* | | am d82800b8: am 4ee58568: am f3ca9477: Merge "New Telephony APIs to return MM...Yuhao Zheng2013-10-041-0/+2
|\ \ \ | |/ /
| * | Merge "New Telephony APIs to return MMS UA and UAProfUrl" into klp-devYuhao Zheng2013-10-041-0/+2
| |\ \
| | * | New Telephony APIs to return MMS UA and UAProfUrlYuhao Zheng2013-10-031-0/+2
* | | | am 91aa6021: am 310796de: am d6239b92: Merge "Add a scrubber to keyguard; lay...Adam Powell2013-10-041-0/+1
|\ \ \ \ | |/ / /
| * | | Merge "Add a scrubber to keyguard; layout tweaks" into klp-devAdam Powell2013-10-031-0/+1
| |\ \ \
| | * | | Add a scrubber to keyguard; layout tweaksAdam Powell2013-10-031-0/+1
| | |/ /
* | | | resolved conflicts for merge of 92a827b8 to masterAlan Viverette2013-10-041-0/+1
|\ \ \ \ | |/ / /
| * | | Merge "Add importantForAccessibility mode to block entire hierarchy" into klp...Alan Viverette2013-10-031-0/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Add importantForAccessibility mode to block entire hierarchyAlan Viverette2013-10-021-0/+1
| | |/
* | | am 8a5f7ab6: am 22c298a5: am 7192c6d7: Merge "KLP/KitKat is now API 19." into...Dianne Hackborn2013-10-041-1/+1
|\ \ \ | |/ /
| * | Merge "KLP/KitKat is now API 19." into klp-devDianne Hackborn2013-10-031-1/+1
| |\ \
| | * | KLP/KitKat is now API 19.Dianne Hackborn2013-10-031-1/+1
| | |/
* | | am 5eaac1ce: am e31f959c: am d143d1ff: Merge "Fix issue #11044267: AppOpsMana...Dianne Hackborn2013-10-041-1/+1
|\ \ \ | |/ /
| * | Fix issue #11044267: AppOpsManager.startWatchingMode should take a StringDianne Hackborn2013-10-021-1/+1
| |/
* | am e3ba7f24: am c379752a: am 3320ef95: Merge "Add findFocus API for Accessibi...Alan Viverette2013-10-021-0/+1
|\ \ | |/
| * Add findFocus API for AccessibilityNodeProviderAlan Viverette2013-09-301-0/+1
* | am 9eb9ebb2: am 0e772b22: Merge "Unhide setPin, setPin, setPairingConfirmatio...Matthew Xie2013-10-011-0/+9
|\ \ | |/
| * Merge "Unhide setPin, setPin, setPairingConfirmation, and relevant intent fie...Matthew Xie2013-09-301-0/+9
| |\
| | * Unhide setPin, setPin, setPairingConfirmation, and relevant intent fieldsMatthew Xie2013-09-291-0/+9
* | | am 65cacb3c: Merge "Add android.provider.Telephony to public API." into klp-devJake Hamby2013-10-011-0/+271
|\ \ \ | |/ /
| * | Merge "Add android.provider.Telephony to public API." into klp-devJake Hamby2013-09-301-0/+271
| |\ \
| | * | Add android.provider.Telephony to public API.Jake Hamby2013-09-241-0/+271
* | | | Merge "Update TimePicker widget and its related dialog"Fabrice Di Meglio2013-10-011-2/+1
|\ \ \ \
| * | | | Update TimePicker widget and its related dialogFabrice Di Meglio2013-09-271-2/+1
* | | | | am cc637d9a: Merge "New roots UX, async, performance, docs." into klp-devJeff Sharkey2013-09-301-9/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "New roots UX, async, performance, docs." into klp-devJeff Sharkey2013-09-281-9/+2
| |\ \ \ \
| | * | | | New roots UX, async, performance, docs.Jeff Sharkey2013-09-271-9/+2
* | | | | | am 9552f9b8: Merge "Camera2: remove CameraDevice#getProperties" into klp-devZhijun He2013-09-301-1/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Camera2: remove CameraDevice#getPropertiesZhijun He2013-09-271-1/+0
| | |_|_|/ | |/| | |
* | | | | am 723ad75e: Merge "API cleanups for Notification." into klp-devDaniel Sandler2013-09-301-5/+1
|\ \ \ \ \ | |/ / / /
| * | | | API cleanups for Notification.Daniel Sandler2013-09-271-5/+1
* | | | | am 8fb6d97a: Merge "Add gravity settings to PopupWindow/ListPopupWindow/Popup...Adam Powell2013-09-301-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu" into kl...Adam Powell2013-09-271-0/+3
| |\ \ \ \
| | * | | | Add gravity settings to PopupWindow/ListPopupWindow/PopupMenuAdam Powell2013-09-261-0/+3
* | | | | | Merge "Add ProgressBar methods to set tileable Drawables"Alan Viverette2013-09-261-0/+2
|\ \ \ \ \ \
| * | | | | | Add ProgressBar methods to set tileable DrawablesAlan Viverette2013-09-261-0/+2
* | | | | | | am 66ee877f: am 8c6c0419: Merge "Tighten flags enforcement, API to test Uris....Jeff Sharkey2013-09-261-0/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Tighten flags enforcement, API to test Uris." into klp-devJeff Sharkey2013-09-261-0/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Tighten flags enforcement, API to test Uris.Jeff Sharkey2013-09-261-0/+1
| | | |/ / / | | |/| | |