Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 4c5f2a9d: am ed1c8d7d: am 0aa1017f: Prevent allocation overflows by corrup... | Martijn Coenen | 2011-06-08 | 1 | -0/+13 |
|\ | |||||
| * | am ed1c8d7d: am 0aa1017f: Prevent allocation overflows by corrupt NDEF records. | Martijn Coenen | 2011-06-07 | 1 | -0/+13 |
| |\ | |||||
| | * | am 0aa1017f: Prevent allocation overflows by corrupt NDEF records. | Martijn Coenen | 2011-06-01 | 1 | -0/+13 |
| | |\ | |||||
| | | * | Prevent allocation overflows by corrupt NDEF records. | Martijn Coenen | 2011-05-31 | 1 | -0/+13 |
| * | | | am 8148cc3e: am 86ea1f5f: Initial checkin of spot presentation for touchpad g... | Jeff Brown | 2011-05-25 | 4 | -0/+232 |
| |\ \ \ | |||||
| | * \ \ | am 86ea1f5f: Initial checkin of spot presentation for touchpad gestures. (DO ... | Jeff Brown | 2011-05-25 | 4 | -0/+232 |
| | |\ \ \ | |||||
| | | * | | | Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE) | Jeff Brown | 2011-05-25 | 4 | -0/+232 |
| * | | | | | am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical stability.... | Jeff Brown | 2011-05-25 | 6 | -28/+223 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | am 94e838f6: Merge "Improve VelocityTracker numerical stability. (DO NOT MERG... | Jeff Brown | 2011-05-25 | 6 | -28/+223 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Improve VelocityTracker numerical stability. (DO NOT MERGE) | Jeff Brown | 2011-05-23 | 6 | -28/+223 |
* | | | | | | Remove obsolete code. | Romain Guy | 2011-06-08 | 3 | -98/+0 |
* | | | | | | Implement shared-storage full backup/restore | Christopher Tate | 2011-06-07 | 1 | -0/+2 |
* | | | | | | Merge "Fix USE_TEXT_LAYOUT_CACHE define" | Fabrice Di Meglio | 2011-06-06 | 3 | -19/+43 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix USE_TEXT_LAYOUT_CACHE define | Fabrice Di Meglio | 2011-06-06 | 3 | -19/+43 |
* | | | | | | | Remove dead code related to gettid | Glenn Kasten | 2011-06-03 | 1 | -12/+1 |
|/ / / / / / | |||||
* | | | | | | Merge "Take advantage of EGL_BUFFER_PRESERVED on IMG." | Romain Guy | 2011-06-02 | 1 | -2/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Take advantage of EGL_BUFFER_PRESERVED on IMG. | Romain Guy | 2011-06-02 | 1 | -2/+21 |
* | | | | | | | Bluetooth: correcting return value from cancelDiscovery | Albert Mojir | 2011-06-02 | 1 | -3/+8 |
|/ / / / / / | |||||
* | | | | | | Merge "Revert "Use AudioTrack::event_type not int in callback"" | Glenn Kasten | 2011-06-01 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revert "Use AudioTrack::event_type not int in callback" | Glenn Kasten | 2011-06-01 | 1 | -1/+1 |
* | | | | | | | Merge "Add support to OpenGLRendere to draw BiDi text. Bug #4350336" | Romain Guy | 2011-06-01 | 1 | -5/+7 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add support to OpenGLRendere to draw BiDi text. | Romain Guy | 2011-06-01 | 1 | -5/+7 |
* | | | | | | | Use AudioTrack::event_type not int in callback | Glenn Kasten | 2011-06-01 | 1 | -1/+1 |
* | | | | | | | Fix crash when nesting Picture recording. | Marco Nelissen | 2011-05-31 | 1 | -1/+1 |
* | | | | | | | Fix NdefRecord flags handling. | Martijn Coenen | 2011-05-27 | 2 | -3/+8 |
|/ / / / / / | |||||
* | | | | | | Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4... | Jeff Brown | 2011-05-24 | 2 | -38/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Support wrapping app processes to inject debug instrumentation. | Jeff Brown | 2011-05-24 | 2 | -38/+10 |
* | | | | | | | resolved conflicts for merge of 070a19e0 to master | Dianne Hackborn | 2011-05-23 | 1 | -5/+26 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | am 5c8caba2: am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adopt... | Dianne Hackborn | 2011-05-20 | 1 | -5/+37 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into h... | Dianne Hackborn | 2011-05-20 | 1 | -5/+37 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Add ParcelFileDescriptor.fromFd() and .adoptFd(). | Dianne Hackborn | 2011-05-20 | 1 | -5/+37 |
* | | | | | | | am 69ed0b62: am d1735ef9: am 4b41df61: Merge "Use proper type for oob variabl... | Jaikumar Ganesh | 2011-05-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | |||||
| * | | | | | am d1735ef9: am 4b41df61: Merge "Use proper type for oob variable in register... | Jaikumar Ganesh | 2011-05-20 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge "Use proper type for oob variable in register_agent. Without this chang... | Jaikumar Ganesh | 2011-05-20 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | Use proper type for oob variable in register_agent. | Nicu Pavel | 2011-05-05 | 1 | -1/+1 |
| | * | | | | | Adapt to latest skia | Derek Sollenberger | 2011-05-12 | 4 | -5/+2 |
* | | | | | | | Fix another merge problem. | Dianne Hackborn | 2011-05-19 | 1 | -3/+3 |
* | | | | | | | resolved conflicts for merge of 06a8ceac to master | Dianne Hackborn | 2011-05-19 | 2 | -1/+17 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier. | Dianne Hackborn | 2011-05-19 | 2 | -1/+17 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | am 69cb8757: Add new "-swNNNdp" resource qualifier. | Dianne Hackborn | 2011-05-19 | 2 | -1/+17 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Add new "-swNNNdp" resource qualifier. | Dianne Hackborn | 2011-05-19 | 2 | -1/+17 |
* | | | | | | | resolved conflicts for merge of c1730dcf to master | Mike Lockwood | 2011-05-19 | 1 | -0/+22 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am ae448e2c: am a88b42d5: USB: Add method to access raw USB device descriptors | Mike Lockwood | 2011-05-19 | 1 | -0/+22 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | am a88b42d5: USB: Add method to access raw USB device descriptors | Mike Lockwood | 2011-05-19 | 1 | -0/+22 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | USB: Add method to access raw USB device descriptors | Mike Lockwood | 2011-05-19 | 1 | -0/+22 |
* | | | | | | | Merge c41aefe1 | Jean-Baptiste Queru | 2011-05-19 | 1 | -60/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 59b1a4ed: Switch to use netd to add/remove routes. | Robert Greenwalt | 2011-05-18 | 1 | -60/+0 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Switch to use netd to add/remove routes. | Robert Greenwalt | 2011-05-18 | 1 | -60/+0 |
| * | | | | | | am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework... | Dianne Hackborn | 2011-05-16 | 1 | -8/+8 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size... | Dianne Hackborn | 2011-05-16 | 1 | -8/+8 |
| | |\ \ \ \ \ | | | |/ / / / |