summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge WebKit at r82507: Update useragent string"Steve Block2011-06-081-1/+1
|\
| * Merge WebKit at r82507: Update useragent stringSteve Block2011-06-081-1/+1
* | Merge "Fix the display name of InputMethodSubtype"satok2011-06-081-13/+36
|\ \
| * | Fix the display name of InputMethodSubtypesatok2011-06-081-13/+36
* | | Merge "Fix the threading behaviour of TTS audio requests."Narayan Kamath2011-06-087-240/+686
|\ \ \
| * | | Fix the threading behaviour of TTS audio requests.Narayan Kamath2011-06-077-240/+686
| | |/ | |/|
* | | Intent to manage application network data usage.Jeff Sharkey2011-06-081-0/+9
* | | Compute range-based usage in NetworkStatsHistory.Jeff Sharkey2011-06-072-2/+149
* | | UID network stats, secure settings, and random.Jeff Sharkey2011-06-073-10/+76
* | | Map network identity using ConnectivityService.Jeff Sharkey2011-06-0710-62/+285
* | | Merge "Use external/mockwebserver in frameworks/base"Jesse Wilson2011-06-074-14/+14
|\ \ \
| * | | Use external/mockwebserver in frameworks/baseJesse Wilson2011-06-074-14/+14
* | | | resolved conflicts for merge of a7d01a75 to masterAdam Powell2011-06-071-1/+4
|\ \ \ \
| * \ \ \ am 212d15c7: am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Li...Adam Powell2011-06-071-0/+4
| |\ \ \ \
| | * \ \ \ am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionB...Adam Powell2011-06-071-0/+4
| | |\ \ \ \
| | | * | | | Make Theme.Holo.Light.NoActionBar andAdam Powell2011-06-071-0/+4
* | | | | | | resolved conflicts for merge of 8b2c0014 to masterJeff Brown2011-06-071-3/+37
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am b3536145: am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into h...Jeff Brown2011-06-061-3/+37
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2Jeff Brown2011-06-061-3/+37
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Touch pad improvements.Jeff Brown2011-06-061-3/+37
* | | | | | | am c3709f25: am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when ...Jeff Brown2011-06-071-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the mou...Jeff Brown2011-06-061-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." in...Jeff Brown2011-06-061-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Improve browser scrolling when using the mouse wheel.Jeff Brown2011-06-061-1/+1
| * | | | | Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/framew...Nick Pelly2011-06-0641-2/+412
| |\ \ \ \ \
| | * \ \ \ \ am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" ...Eric Fischer2011-06-0641-2/+412
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycom...Eric Fischer2011-06-0641-2/+412
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2Eric Fischer2011-06-0641-2/+412
| | | | |\ \ \
| | | | | * | | Import revised translations. DO NOT MERGEEric Fischer2011-06-0341-2/+412
* | | | | | | | Merge "Update walled garden detection logic"Irfan Sheriff2011-06-071-0/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Update walled garden detection logicIrfan Sheriff2011-06-071-0/+24
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge "Volume Panel sizing for phones."Amith Yamasani2011-06-072-14/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Volume Panel sizing for phones.Amith Yamasani2011-06-062-14/+11
* | | | | | | | | Rename atribute View horizontalDirection to layoutDirection and update unit t...Fabrice Di Meglio2011-06-075-63/+66
* | | | | | | | | Merge "StorageVolume: Add allowMassStorage flag"Mike Lockwood2011-06-072-5/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | StorageVolume: Add allowMassStorage flagMike Lockwood2011-06-072-5/+21
* | | | | | | | | | Merge "Implement shared-storage full backup/restore"Christopher Tate2011-06-075-17/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Implement shared-storage full backup/restoreChristopher Tate2011-06-075-17/+22
* | | | | | | | | | | Merge "Add columns: Events.lastSynced: flag marking this as a duplicate of ...Alon Albert2011-06-071-5/+38
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add columns:Alon Albert2011-06-071-5/+38
* | | | | | | | | | | Merge "Add comment for deprecation of Intent.ACTION_UMS_CONNECTED and ACTION_...Mike Lockwood2011-06-071-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Add comment for deprecation of Intent.ACTION_UMS_CONNECTED and ACTION_UMS_DIS...Mike Lockwood2011-06-071-2/+2
* | | | | | | | | | | Merge "Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTED"Mike Lockwood2011-06-071-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | / / / / / / / / / | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTEDMike Lockwood2011-06-071-2/+4
* | | | | | | | | | Merge "Improve android.hardware.Camera.Area javadoc."Wu-cheng Li2011-06-071-22/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Improve android.hardware.Camera.Area javadoc.Wu-cheng Li2011-06-071-22/+34
* | | | | | | | | | | Interrogation of the view hierarchy from an AccessibilityService.Svetoslav Ganov2011-06-0626-86/+2946
* | | | | | | | | | | Merge "Rename Gravity BEFORE/AFTER to START/END"Fabrice Di Meglio2011-06-067-41/+42
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Rename Gravity BEFORE/AFTER to START/ENDFabrice Di Meglio2011-06-067-41/+42
* | | | | | | | | | | | Merge "Import revised translations."Eric Fischer2011-06-0646-1/+185
|\ \ \ \ \ \ \ \ \ \ \ \