summaryrefslogtreecommitdiffstats
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge "Change XML-grammar for (Off)HostApduServices."Martijn Coenen2013-07-263-112/+68
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Change XML-grammar for (Off)HostApduServices.Martijn Coenen2013-07-253-112/+68
* | | | | | | | | Merge "Fix lazy measure logic to not use obsolete values"Chet Haase2013-07-261-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix lazy measure logic to not use obsolete valuesChet Haase2013-07-251-1/+2
* | | | | | | | | | Merge "Fixed NPE in SyncRequest for Bundle.EMPTY"Matthew Williams2013-07-261-28/+36
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed NPE in SyncRequest for Bundle.EMPTYMatthew Williams2013-07-251-28/+36
| |/ / / / / / / / /
* | | | | | | | | | Merge "Okay, I give in, add null key support to ArrayMap and ArraySet."Dianne Hackborn2013-07-262-31/+115
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Okay, I give in, add null key support to ArrayMap and ArraySet.Dianne Hackborn2013-07-252-31/+115
* | | | | | | | | | | am d766d71a: am d547bcec: Merge "Return the actual interpolator of the ViewPr...Chet Haase2013-07-251-2/+20
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | am d547bcec: Merge "Return the actual interpolator of the ViewPropertyAnimator"Chet Haase2013-07-251-2/+20
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Merge "Return the actual interpolator of the ViewPropertyAnimator"Chet Haase2013-07-251-2/+20
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Return the actual interpolator of the ViewPropertyAnimatorCyril Mottier2013-07-251-2/+20
* | | | | | | | | | | Fixes to javadocMatthew Williams2013-07-251-45/+57
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | resolved conflicts for merge of a35ec14f to masterElliott Hughes2013-07-251-452/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 03bd8324: Merge "Switch DateUtils.formatDateRange over to an icu4c-based i...Elliott Hughes2013-07-251-452/+13
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Switch DateUtils.formatDateRange over to an icu4c-based implementation.Elliott Hughes2013-07-241-452/+13
| | |/ / / / / / /
* | | | | | | | | Fix docs build.Ying Wang2013-07-241-13/+13
* | | | | | | | | Add libbatteryservice AIDL and java interfacesTodd Poynor2013-07-254-0/+155
* | | | | | | | | Merge "Update setAdapter() documentation for Spinner"Alan Viverette2013-07-251-0/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update setAdapter() documentation for SpinnerAlan Viverette2013-07-241-0/+12
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge "Bluetooth stopped working in master - "bad file descriptor""Zhihai Xu2013-07-251-2/+7
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Bluetooth stopped working in master - "bad file descriptor"Zhihai Xu2013-07-241-2/+7
| |/ / / / / / /
* | | | | | | | Merge "Use clearFocus() when entering touch mode"Alan Viverette2013-07-242-18/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Use clearFocus() when entering touch modeAlan Viverette2013-07-242-18/+21
| |/ / / / / / /
* | | | | | | | Merge "AnonymousSyncService & SyncRequest."Matthew Williams2013-07-249-24/+1051
|\ \ \ \ \ \ \ \
| * | | | | | | | AnonymousSyncService & SyncRequest.Matthew Williams2013-07-249-24/+1051
* | | | | | | | | Merge "camera2: Implement CameraDevice#waitUntilIdle"Zhijun He2013-07-242-4/+23
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | camera2: Implement CameraDevice#waitUntilIdleZhijun He2013-07-232-4/+23
* | | | | | | | | Merge "Add secure settings for captions"Alan Viverette2013-07-242-0/+352
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add secure settings for captionsAlan Viverette2013-07-232-0/+352
* | | | | | | | | | Merge "Update WebView.loadDataWithBaseURL documentation."Ben Murdoch2013-07-241-1/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update WebView.loadDataWithBaseURL documentation.Ben Murdoch2013-07-231-1/+4
* | | | | | | | | | | Merge "Use hostname verifier directly instead of instance"Kenny Root2013-07-241-4/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use hostname verifier directly instead of instanceKenny Root2013-07-231-4/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge "Updating the print dialog and its interactinos with the printing app."Svetoslav Ganov2013-07-241-0/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Updating the print dialog and its interactinos with the printing app.Svetoslav Ganov2013-07-231-0/+16
* | | | | | | | | | | | Merge "Fix handling of ListPreference.setValue()"Alan Viverette2013-07-231-4/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix handling of ListPreference.setValue()Alan Viverette2013-07-231-4/+12
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Add support for notification scorers.Scott Greenwald2013-07-231-0/+7
* | | | | | | | | | | | Merge "Add controller numbers for gamepads / joysticks"Michael Wright2013-07-231-4/+21
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add controller numbers for gamepads / joysticksMichael Wright2013-07-231-4/+21
* | | | | | | | | | | | | Merge "allow rich notifications in the heads up."Chris Wren2013-07-231-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | allow rich notifications in the heads up.Chris Wren2013-07-231-0/+24
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Fix crash in app widgets Bug #9983130"Romain Guy2013-07-231-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix crash in app widgetsRomain Guy2013-07-231-1/+5
* | | | | | | | | | | | | | Add "adb shell am restart" command.Dianne Hackborn2013-07-233-0/+34
* | | | | | | | | | | | | | Merge "Add new facility for apps to declared their preferred intents."Dianne Hackborn2013-07-232-13/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Add new facility for apps to declared their preferred intents.Dianne Hackborn2013-07-222-13/+50
* | | | | | | | | | | | | | Merge "Fix supplimentary network connections with VPNs"Geremy Condra2013-07-232-0/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix supplimentary network connections with VPNsChad Brubaker2013-07-192-0/+28