summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 4ca550a1: am 947e25e5: am ac3c1f55: Add BT test instrumentation for reboot...Eric Rowe2010-09-021-0/+94
|\
| * am 947e25e5: am ac3c1f55: Add BT test instrumentation for reboot tests.Eric Rowe2010-09-021-0/+94
| |\
| | * am ac3c1f55: Add BT test instrumentation for reboot tests.Eric Rowe2010-09-021-0/+94
| | |\
| | | * Add BT test instrumentation for reboot tests.Eric Rowe2010-08-311-0/+94
* | | | Merge "Adding features for new hardware, and creating a baseline list of requ...Dan Morrill2010-09-025-2/+132
|\ \ \ \
| * | | | Adding features for new hardware, and creating a baseline list of requiredDan Morrill2010-09-025-2/+132
* | | | | am 5402c34b: am 26d708d9: Merge "InputMethodManager showSoftInput return docu...Gilles Debunne2010-09-021-9/+6
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 26d708d9: Merge "InputMethodManager showSoftInput return documentation." i...Gilles Debunne2010-09-021-9/+6
| |\ \ \ | | |/ /
| | * | Merge "InputMethodManager showSoftInput return documentation." into gingerbreadGilles Debunne2010-09-021-9/+6
| | |\ \
| | | * | InputMethodManager showSoftInput return documentation.Gilles Debunne2010-08-311-9/+6
* | | | | Add startPreferenceFragment()Andrew Stadler2010-09-022-4/+34
* | | | | Merge "Decouple Tethering UI with registering of SDP records."Jaikumar Ganesh2010-09-024-11/+14
|\ \ \ \ \
| * | | | | Decouple Tethering UI with registering of SDP records.Jaikumar Ganesh2010-09-024-11/+14
* | | | | | Merge "Contacts API clean-up (mostly documentation)"Dmitri Plotnikov2010-09-022-24/+37
|\ \ \ \ \ \
| * | | | | | Contacts API clean-up (mostly documentation)Dmitri Plotnikov2010-09-022-24/+37
* | | | | | | am 78495f8c: (-s ours) am 3ac85d31: am 1314219a: (-s ours) DO NOT MERGE Separ...Eric Rowe2010-09-020-0/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | am 3ac85d31: am 1314219a: (-s ours) DO NOT MERGE Separate utility methods int...Eric Rowe2010-09-020-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 1314219a: (-s ours) DO NOT MERGE Separate utility methods into utility class.Eric Rowe2010-09-020-0/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | DO NOT MERGE Separate utility methods into utility class.Eric Rowe2010-08-312-415/+458
* | | | | | am fa5a46a0: (-s ours) am 3010713f: Fix again.Daisuke Miyakawa2010-09-020-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 3010713f: Fix again.Daisuke Miyakawa2010-09-022-3/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix again.Daisuke Miyakawa2010-09-022-3/+7
* | | | | | Merge "Handle disabled state for action menu items"Adam Powell2010-09-021-0/+7
|\ \ \ \ \ \
| * | | | | | Handle disabled state for action menu itemsAdam Powell2010-09-021-0/+7
* | | | | | | am b2b973d1: (-s ours) am 3bd9b8f0: Fix build breakage.Daisuke Miyakawa2010-09-020-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 3bd9b8f0: Fix build breakage.Daisuke Miyakawa2010-09-028-4/+35
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Fix build breakage.Daisuke Miyakawa2010-09-028-4/+35
* | | | | | | am 22a17ce6: (-s ours) am b1f5a54a: Merge "VCard refactoring backport." into ...Daisuke Miyakawa2010-09-020-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am b1f5a54a: Merge "VCard refactoring backport." into gingerbreadDaisuke Miyakawa2010-09-0246-2719/+4254
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "VCard refactoring backport." into gingerbreadDaisuke Miyakawa2010-09-0246-2719/+4254
| | |\ \ \ \ \
| | | * | | | | VCard refactoring backport.Daisuke Miyakawa2010-09-0246-2719/+4254
* | | | | | | | Merge "Only close the IME if it is Active on the WebView."Leon Scroggins III2010-09-022-4/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Only close the IME if it is Active on the WebView.Leon Scroggins III2010-09-022-4/+8
* | | | | | | | | am 937056c1: am 32ec1ad1: Merge "Fix problem in AudioEffect::command() status...Eric Laurent2010-09-021-5/+9
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am 32ec1ad1: Merge "Fix problem in AudioEffect::command() status." into ginge...Eric Laurent2010-09-021-5/+9
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge "Fix problem in AudioEffect::command() status." into gingerbreadEric Laurent2010-09-021-5/+9
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix problem in AudioEffect::command() status.Eric Laurent2010-09-021-5/+9
* | | | | | | | | | am d0743dfb: resolved conflicts for merge of bd6abed3 to gingerbread-plus-aospJean-Baptiste Queru2010-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | resolved conflicts for merge of bd6abed3 to gingerbread-plus-aospJean-Baptiste Queru2010-09-020-0/+0
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge "Add a --debug-mode option to aapt."Xavier Ducrohet2010-09-023-2/+18
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Add a --debug-mode option to aapt.Xavier Ducrohet2010-08-313-2/+18
* | | | | | | | | | | | Merge "MTP: Implement support for getting/setting device properties"Mike Lockwood2010-09-026-24/+332
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | MTP: Implement support for getting/setting device propertiesMike Lockwood2010-09-026-24/+332
* | | | | | | | | | | | | Merge "Correctly apply alpha on TextView. Bug #2969691"Romain Guy2010-09-022-27/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Correctly apply alpha on TextView.Romain Guy2010-09-022-27/+3
* | | | | | | | | | | | | | am 6aa717e4: (-s ours) am 97e58ef4: Merge "DO NOT MERGE Separate utility meth...Eric Rowe2010-09-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 97e58ef4: Merge "DO NOT MERGE Separate utility methods into utility class....Eric Rowe2010-09-023-939/+975
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge "DO NOT MERGE Separate utility methods into utility class." into ginger...Eric Rowe2010-09-023-939/+975
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | DO NOT MERGE Separate utility methods into utility class.Eric Rowe2010-09-023-939/+975
* | | | | | | | | | | | | | | Merge "Use the new signals sent by Bluez for PAN."Jaikumar Ganesh2010-09-022-3/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \