Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add onSurfaceTextureDestroyed() callback. | Romain Guy | 2011-06-10 | 1 | -10/+37 |
* | Add a way to measure potential framerate of the view hierarchy. | Romain Guy | 2011-06-09 | 2 | -8/+58 |
* | Remove obsolete code. | Romain Guy | 2011-06-08 | 4 | -111/+0 |
* | am 1f866589: am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE | John Wang | 2011-06-08 | 5 | -1/+405 |
|\ | |||||
| * | am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE | John Wang | 2011-06-07 | 5 | -1/+405 |
| |\ | |||||
| | * | Merge "Add SIM PUK unlockscreen." into honeycomb-LTE | John Wang | 2011-06-07 | 5 | -1/+405 |
| | |\ | |||||
| | | * | Add SIM PUK unlockscreen. | John Wang | 2011-06-07 | 5 | -1/+405 |
* | | | | The service part of the user space VPN support. | Chia-chi Yeh | 2011-06-08 | 3 | -1/+57 |
* | | | | Merge "Move NDEF URI helper method into android.nfc.NfcRecord" | Nick Pelly | 2011-06-08 | 1 | -0/+91 |
|\ \ \ \ | |||||
| * | | | | Move NDEF URI helper method into android.nfc.NfcRecord | Nick Pelly | 2011-06-08 | 1 | -0/+91 |
* | | | | | Merge "Add 'Property' object" | Chet Haase | 2011-06-08 | 12 | -93/+925 |
|\ \ \ \ \ | |||||
| * | | | | | Add 'Property' object | Chet Haase | 2011-06-08 | 12 | -93/+925 |
* | | | | | | Merge "Implement Felica timeout handling (API)." | Martijn Coenen | 2011-06-08 | 4 | -11/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Implement Felica timeout handling (API). | Martijn Coenen | 2011-06-08 | 4 | -11/+28 |
* | | | | | | | Merge "resolved conflicts for merge of e139167c to master" | Robert Greenwalt | 2011-06-08 | 1 | -9/+7 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | resolved conflicts for merge of e139167c to master | Robert Greenwalt | 2011-06-08 | 1 | -9/+7 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | / / / | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTE | Robert Greenwalt | 2011-06-07 | 1 | -9/+9 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | resolved conflicts for merge of 8de47a2f to honeycomb-LTE | Robert Greenwalt | 2011-06-07 | 1 | -9/+9 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | Merge "Reveal some network constants." into honeycomb-mr2 | Robert Greenwalt | 2011-06-07 | 1 | -9/+9 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Reveal some network constants. | Robert Greenwalt | 2011-05-31 | 1 | -9/+9 |
* | | | | | | | | | Merge "UsbManager: Clean up extras for ACTION_USB_STATE broadcast" | Mike Lockwood | 2011-06-08 | 1 | -20/+19 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | UsbManager: Clean up extras for ACTION_USB_STATE broadcast | Mike Lockwood | 2011-06-08 | 1 | -20/+19 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge "Updates to Camera API documentation." | Eino-Ville Talvala | 2011-06-08 | 1 | -67/+98 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Updates to Camera API documentation. | Eino-Ville Talvala | 2011-06-07 | 1 | -67/+98 |
* | | | | | | | | | | Merge "Merge WebKit at r82507: Update useragent string" | Steve Block | 2011-06-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Merge WebKit at r82507: Update useragent string | Steve Block | 2011-06-08 | 1 | -1/+1 |
* | | | | | | | | | | Merge "Fix the display name of InputMethodSubtype" | satok | 2011-06-08 | 1 | -13/+36 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix the display name of InputMethodSubtype | satok | 2011-06-08 | 1 | -13/+36 |
* | | | | | | | | | | | Merge "Fix the threading behaviour of TTS audio requests." | Narayan Kamath | 2011-06-08 | 7 | -240/+686 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix the threading behaviour of TTS audio requests. | Narayan Kamath | 2011-06-07 | 7 | -240/+686 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Intent to manage application network data usage. | Jeff Sharkey | 2011-06-08 | 1 | -0/+9 |
* | | | | | | | | | | Compute range-based usage in NetworkStatsHistory. | Jeff Sharkey | 2011-06-07 | 2 | -2/+149 |
* | | | | | | | | | | UID network stats, secure settings, and random. | Jeff Sharkey | 2011-06-07 | 3 | -10/+76 |
* | | | | | | | | | | Map network identity using ConnectivityService. | Jeff Sharkey | 2011-06-07 | 10 | -62/+285 |
* | | | | | | | | | | Merge "Use external/mockwebserver in frameworks/base" | Jesse Wilson | 2011-06-07 | 4 | -14/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Use external/mockwebserver in frameworks/base | Jesse Wilson | 2011-06-07 | 4 | -14/+14 |
* | | | | | | | | | | | resolved conflicts for merge of a7d01a75 to master | Adam Powell | 2011-06-07 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | am 212d15c7: am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Li... | Adam Powell | 2011-06-07 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionB... | Adam Powell | 2011-06-07 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | | * | | | | | | | Make Theme.Holo.Light.NoActionBar and | Adam Powell | 2011-06-07 | 1 | -0/+4 |
* | | | | | | | | | | resolved conflicts for merge of 8b2c0014 to master | Jeff Brown | 2011-06-07 | 1 | -3/+37 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am b3536145: am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into h... | Jeff Brown | 2011-06-06 | 1 | -3/+37 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2 | Jeff Brown | 2011-06-06 | 1 | -3/+37 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | * | | | | | | | Touch pad improvements. | Jeff Brown | 2011-06-06 | 1 | -3/+37 |
* | | | | | | | | | | am c3709f25: am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when ... | Jeff Brown | 2011-06-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | / / / / / / | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the mou... | Jeff Brown | 2011-06-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." in... | Jeff Brown | 2011-06-06 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | Improve browser scrolling when using the mouse wheel. | Jeff Brown | 2011-06-06 | 1 | -1/+1 |
| * | | | | | | | | Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/framew... | Nick Pelly | 2011-06-06 | 41 | -2/+412 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" ... | Eric Fischer | 2011-06-06 | 41 | -2/+412 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / |