summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge "Modify the interface of HanziToPinyin class to make it generic and add...Eugene Koh2010-01-262-37/+147
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Modify the interface of HanziToPinyin class to make it generic and add test c...Bai Tao2010-01-232-37/+147
* | | | | | | | | Merge "remove @deprecated from dropDownHeight and dropDownWidth"Scott Main2010-01-261-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove @deprecated from dropDownHeight and dropDownWidthScott Main2010-01-261-2/+2
* | | | | | | | | | Merge "remove @deprecated tag from "fill_parent" because it bubbles up and de...Scott Main2010-01-261-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | / / / / / / / | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | remove @deprecated tag from "fill_parent" because it bubbles upScott Main2010-01-261-2/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge "MountService: Explicitly query volume state on startup"San Mehat2010-01-261-10/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | MountService: Explicitly query volume state on startupSan Mehat2010-01-261-10/+42
* | | | | | | | | Merge "NativeDaemonConnector: fix doListCommand() to return *all* list elements"San Mehat2010-01-261-5/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | NativeDaemonConnector: fix doListCommand() to return *all* list elementsSan Mehat2010-01-261-5/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge "Move towards a formal public API for backup and restore"Chris Tate2010-01-264-8/+242
|\ \ \ \ \ \ \ \
| * | | | | | | | Move towards a formal public API for backup and restoreChristopher Tate2010-01-254-8/+242
* | | | | | | | | More device admin work: description, policy control.Dianne Hackborn2010-01-2611-34/+523
* | | | | | | | | Merge "add API to change default config on image decoders."Mike Reed2010-01-262-1/+43
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add API to change default config on image decoders.Mike Reed2010-01-262-1/+43
* | | | | | | | | | Unhide brightness constants to help unbundle Camera.Chih-Chung Chang2010-01-262-3/+33
* | | | | | | | | | Merge "Unhide the secure setting for LocationProviderEnabled"Mike Lockwood2010-01-262-4/+32
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Unhide the secure setting for LocationProviderEnabledMark Vandevoorde2010-01-262-4/+32
* | | | | | | | | | | Merge "Turn the debugging back on."Jason Sams2010-01-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Turn the debugging back on.Jason Sams2010-01-261-0/+1
* | | | | | | | | | | | Merge "Make PackageManager unpack gdbserver binaries at installation time."David Turner2010-01-262-14/+84
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Make PackageManager unpack gdbserver binaries at installation time.David 'Digit' Turner2010-01-252-14/+84
* | | | | | | | | | | | Merge "Fix memory leak with layers. This fix bug http://b/2394813 This is a t...Nicolas Roard2010-01-261-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix memory leak with layers.Nicolas Roard2010-01-261-2/+2
* | | | | | | | | | | | | Merge "Revert "Fix failure to open AVRCP input device due to EPERM.""Nick Pelly2010-01-261-7/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Revert "Fix failure to open AVRCP input device due to EPERM."Nick Pelly2010-01-261-7/+1
* | | | | | | | | | | | | am 5b7ea014: (-s ours) am e7b2845d: Merge "DO NOT MERGE return an error when ...Patrick Scott2010-01-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am e7b2845d: Merge "DO NOT MERGE return an error when Surface::lock() is call...Patrick Scott2010-01-261-3/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "DO NOT MERGE return an error when Surface::lock() is called while the ...Patrick Scott2010-01-261-3/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | DO NOT MERGEMathias Agopian2010-01-251-3/+11
* | | | | | | | | | | | | | | | am c811cd91: am caf0ce3c: Delay resetting mPreventDrag flags so that the Plug...Grace Kloba2010-01-261-8/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am caf0ce3c: Delay resetting mPreventDrag flags so that the Plugin will have ...Grace Kloba2010-01-261-8/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Delay resetting mPreventDrag flags so that the PluginGrace Kloba2010-01-251-8/+17
| | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | am cf0957ce: am 77dc179b: As embedded and full screen shares the same view, w...Grace Kloba2010-01-261-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | am 77dc179b: As embedded and full screen shares the same view, we have to rep...Grace Kloba2010-01-261-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | As embedded and full screen shares the same view,Grace Kloba2010-01-211-0/+7
* | | | | | | | | | | | | | resolved conflicts for merge of 1f2f23bd to masterRobert Greenwalt2010-01-261-19/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | am 9fdf82e0: Merge "Try to switch to another default net on connection failur...Robert Greenwalt2010-01-211-21/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Try to switch to another default net on connection failure." into eclairRobert Greenwalt2010-01-211-21/+43
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Try to switch to another default net on connection failure.Robert Greenwalt2010-01-201-21/+43
* | | | | | | | | | | | | | | | Support for audio recording into AMR NB/WB files as well as audio tracks in M...Andreas Huber2010-01-267-19/+177
| |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "NetworkManagementService: Start service when SystemServer starts up"San Mehat2010-01-263-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | NetworkManagementService: Start service when SystemServer starts upSan Mehat2010-01-263-1/+20
* | | | | | | | | | | | | | | Merge "Set a flag that indicates a response is pending."Patrick Scott2010-01-261-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Set a flag that indicates a response is pending.Patrick Scott2010-01-261-2/+16
* | | | | | | | | | | | | | | | Add android.provider.Settings.ACTION_DEVICE_INFO_SETTINGS.Daniel Sandler2010-01-262-0/+26
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "MountService: Add support for renaming secure containers"San Mehat2010-01-263-1/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | MountService: Add support for renaming secure containersSan Mehat2010-01-233-1/+24
* | | | | | | | | | | | | | | Adding Recognition Service and Listener wrappersValentin Kravtsov2010-01-269-370/+869
* | | | | | | | | | | | | | | resolved conflicts for merge of d0514347 to masterIrfan Sheriff2010-01-251-12/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |