summaryrefslogtreecommitdiffstats
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* Fix a typo in FrameLayout JavaDocSteve Block2011-04-131-2/+1
* Merge "Use an @hide libcore API to get the FileDescriptor from a Socket."Elliott Hughes2011-04-131-35/+32
|\
| * Use an @hide libcore API to get the FileDescriptor from a Socket.Elliott Hughes2011-04-121-35/+32
* | Merge "Add camera metering area API."Wu-cheng Li2011-04-131-20/+95
|\ \
| * | Add camera metering area API.Wu-cheng Li2011-04-131-20/+95
* | | Add APIs to remove tasks.Dianne Hackborn2011-04-129-17/+169
| |/ |/|
* | Merge "protect all /cache/recovery/last_* files from deletion"Doug Zongker2011-04-121-3/+4
|\ \
| * | protect all /cache/recovery/last_* files from deletionDoug Zongker2011-04-121-3/+4
| |/
* | Merge "Fix in BreakIterator."Gilles Debunne2011-04-112-15/+20
|\ \
| * | Fix in BreakIterator.Gilles Debunne2011-04-082-15/+20
* | | am f953d3e2: am 7f506024: am 78a9766b: Merge "Implement teardown script." int...Jason parks2011-04-113-1/+92
|\ \ \
| * \ \ am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbreadJason parks2011-04-113-1/+92
| |\ \ \
| | * \ \ am 78a9766b: Merge "Implement teardown script." into gingerbreadJason parks2011-04-043-1/+92
| | |\ \ \
| | | * \ \ Merge "Implement teardown script." into gingerbreadJason parks2011-04-013-1/+92
| | | |\ \ \
| | | | * | | Implement teardown script.Jason parks2011-04-013-1/+92
* | | | | | | am a83bc160: am 7bb236c3: am 84d34078: Make the NFC UID forward compatible.Jeff Hamilton2011-04-111-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 7bb236c3: am 84d34078: Make the NFC UID forward compatible.Jeff Hamilton2011-04-111-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 84d34078: Make the NFC UID forward compatible.Jeff Hamilton2011-04-041-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Make the NFC UID forward compatible.Jeff Hamilton2011-04-011-1/+1
| | | |/ / /
* | | | | | Merge "Package manager changes to store and update user information."Amith Yamasani2011-04-116-63/+301
|\ \ \ \ \ \
| * | | | | | Package manager changes to store and update user information.Amith Yamasani2011-04-116-63/+301
* | | | | | | am 2df36fd6: am b7e8a54d: Merge "Add prepaid data services URL to Secure Sett...Freeman Ng2011-04-111-0/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into ho...Freeman Ng2011-04-111-0/+7
| |\ \ \ \ \
| | * \ \ \ \ Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTEFreeman Ng2011-04-111-0/+7
| | |\ \ \ \ \
| | | * | | | | Add prepaid data services URL to Secure SettingsFreeman Ng2011-04-071-0/+7
* | | | | | | | Merge "Rework thumbnails in activity manager."Dianne Hackborn2011-04-084-10/+97
|\ \ \ \ \ \ \ \
| * | | | | | | | Rework thumbnails in activity manager.Dianne Hackborn2011-04-084-10/+97
* | | | | | | | | Add keychain user with special keystore access permissionsBrian Carlstrom2011-04-081-0/+6
* | | | | | | | | Merge "Tolerate missing AccountManager resource, not just missing resource name"Brian Carlstrom2011-04-085-9/+33
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Tolerate missing AccountManager resource, not just missing resource nameBrian Carlstrom2011-04-075-9/+33
* | | | | | | | | | Merge "Don't send pause again when coming back from full screen"Teng-Hui Zhu2011-04-081-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't send pause again when coming back from full screenTeng-Hui Zhu2011-04-071-1/+3
* | | | | | | | | | | Merge "Add camera focus area API."Wu-cheng Li2011-04-081-0/+158
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add camera focus area API.Wu-cheng Li2011-04-081-0/+158
* | | | | | | | | | | | Rename CorrectionSpan to SuggestionSpansatok2011-04-083-22/+22
|/ / / / / / / / / / /
* | | | | | | | | | | Remove the deprecated things from Config.java. These haven't been working sin...Joe Onorato2011-04-0749-201/+94
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge "Improve activity manager debug dumps."Dianne Hackborn2011-04-077-88/+184
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Improve activity manager debug dumps.Dianne Hackborn2011-04-077-88/+184
* | | | | | | | | | am 16d8de7a: am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- jav...Nicolas Roard2011-04-071-1/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart...Nicolas Roard2011-04-071-1/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix f...Nicolas Roard2011-04-071-1/+0
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge "Remove uncalled function -- java counterpart of the fix for bug:418380...Nicolas Roard2011-04-071-1/+0
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Remove uncalled function -- java counterpart ofNicolas Roard2011-04-071-1/+0
| * | | | | | | | | | | am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1Teng-Hui Zhu2011-04-073-5/+60
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1Teng-Hui Zhu2011-04-073-5/+60
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | DO NOT MERGE : cherry pick of change Ieb7ae26b from masterTeng-Hui Zhu2011-04-073-9/+34
| | | * | | | | | | | | DO NOT MERGE : cherry pick of change I0f9f2c65 from masterTeng-Hui Zhu2011-04-072-3/+33
* | | | | | | | | | | | Merge "Fix crash in bug 4259574"Adam Cohen2011-04-071-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix crash in bug 4259574Adam Cohen2011-04-071-0/+2
* | | | | | | | | | | | | Merge "Add params for primary account to ContactsContract"Daisuke Miyakawa2011-04-071-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \