summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* The service part of the user space VPN support.Chia-chi Yeh2011-06-083-1/+57
* Merge "Move NDEF URI helper method into android.nfc.NfcRecord"Nick Pelly2011-06-081-0/+91
|\
| * Move NDEF URI helper method into android.nfc.NfcRecordNick Pelly2011-06-081-0/+91
* | Merge "Add 'Property' object"Chet Haase2011-06-0812-93/+925
|\ \
| * | Add 'Property' objectChet Haase2011-06-0812-93/+925
* | | Merge "Implement Felica timeout handling (API)."Martijn Coenen2011-06-084-11/+28
|\ \ \
| * | | Implement Felica timeout handling (API).Martijn Coenen2011-06-084-11/+28
* | | | Merge "resolved conflicts for merge of e139167c to master"Robert Greenwalt2011-06-081-9/+7
|\ \ \ \
| * \ \ \ resolved conflicts for merge of e139167c to masterRobert Greenwalt2011-06-081-9/+7
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTERobert Greenwalt2011-06-071-9/+9
| | |\ \ \
| | | * \ \ resolved conflicts for merge of 8de47a2f to honeycomb-LTERobert Greenwalt2011-06-071-9/+9
| | | |\ \ \
| | | | * \ \ Merge "Reveal some network constants." into honeycomb-mr2Robert Greenwalt2011-06-071-9/+9
| | | | |\ \ \
| | | | | * | | Reveal some network constants.Robert Greenwalt2011-05-311-9/+9
* | | | | | | | Merge "UsbManager: Clean up extras for ACTION_USB_STATE broadcast"Mike Lockwood2011-06-081-20/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | UsbManager: Clean up extras for ACTION_USB_STATE broadcastMike Lockwood2011-06-081-20/+19
| |/ / / / / / /
* | | | | | | | Merge "Updates to Camera API documentation."Eino-Ville Talvala2011-06-081-67/+98
|\ \ \ \ \ \ \ \
| * | | | | | | | Updates to Camera API documentation.Eino-Ville Talvala2011-06-071-67/+98
* | | | | | | | | 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