summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
...
* | | am 1653e261: Merge "Rotation support" into gingerbreadJames Dong2010-11-062-0/+2
|\ \ \ | |/ /
| * | Rotation supportJames Dong2010-11-052-0/+2
* | | am f3847e87: Merge "DO NOT MERGE" into gingerbreadJames Dong2010-11-031-0/+1
|\ \ \ | |/ /
| * | DO NOT MERGEJames Dong2010-11-021-0/+1
* | | am ef8a810b: Merge "Update of DRM framework"Gloria Wang2010-11-023-23/+16
|\ \ \ | | |/ | |/|
| * | Update of DRM frameworkTakeshi Aimi2010-11-023-23/+16
* | | am 120a4594: Drop all dispatcher state when dispatcher is disabled.Jeff Brown2010-10-271-0/+3
|\ \ \ | | |/ | |/|
| * | Drop all dispatcher state when dispatcher is disabled.Jeff Brown2010-10-271-0/+3
* | | resolved conflicts for merge of 9084631d to gingerbread-plus-aospGloria Wang2010-10-255-0/+33
|\ \ \ | | |/ | |/|
| * | DRM framework support:Gloria Wang2010-10-255-0/+33
* | | am 860c2df4: Merge "Add unit tests for native input and fix bugs identified."...Jeff Brown2010-10-241-5/+23
|\ \ \ | | |/ | |/|
| * | Add unit tests for native input and fix bugs identified.Jeff Brown2010-10-231-5/+23
* | | am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" i...Dianne Hackborn2010-10-211-0/+3
|\ \ \ | |/ /
| * | Merge "Fix issue #3117918: No way to finish a native activity" into gingerbreadDianne Hackborn2010-10-211-0/+3
| |\ \
| | * | Fix issue #3117918: No way to finish a native activityDianne Hackborn2010-10-211-0/+3
* | | | am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge...Mathias Agopian2010-10-211-0/+12
|\ \ \ \ | |/ / /
| * | | Merge "Mirror the preview for front-facing cameras. do not merge" into ginger...Mathias Agopian2010-10-211-0/+12
| |\ \ \ | | |/ / | |/| |
| | * | Mirror the preview for front-facing cameras. do not mergeWu-cheng Li2010-10-201-0/+12
* | | | am fa7a87fb: Merge "File writer size estimation improvement" into gingerbreadJames Dong2010-10-201-0/+1
|\ \ \ \ | |/ / /
| * | | File writer size estimation improvementJames Dong2010-10-191-0/+1
| |/ /
* | | am 7689dd49: Merge "Fix bug where home presses were not poking user activity....Jeff Brown2010-10-181-5/+1
|\ \ \ | |/ /
| * | Fix bug where home presses were not poking user activity.Jeff Brown2010-10-181-5/+1
* | | am bc96c284: Merge "For thumbnail extraction make sure we instantiate a decod...Andreas Huber2010-10-181-1/+5
|\ \ \ | |/ /
| * | For thumbnail extraction make sure we instantiate a decoder that allows acces...Andreas Huber2010-10-181-1/+5
* | | am c1a564b1: Merge "Add support for secure system overlays. (DO NOT MERGE)" ...Jeff Brown2010-10-151-0/+1
|\ \ \ | |/ /
| * | Add support for secure system overlays. (DO NOT MERGE)Jeff Brown2010-10-151-0/+1
* | | am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers formerl...Andreas Huber2010-10-1510-0/+6937
|\ \ \ | |/ /
| * | Check-in of a copy of the Khronos OpenMAX headers formerly included from exte...Andreas Huber2010-10-1510-0/+6937
* | | am c1e7b218: Merge "Improve input device calibration format." into gingerbreadJeff Brown2010-10-151-24/+31
|\ \ \ | |/ /
| * | Merge "Improve input device calibration format." into gingerbreadJeff Brown2010-10-151-24/+31
| |\ \
| | * | Improve input device calibration format.Jeff Brown2010-10-141-24/+31
* | | | am 78a76fea: Merge "Revert to using epoll_wait()." into gingerbreadJeff Brown2010-10-141-4/+4
|\ \ \ \ | |/ / /
| * | | Merge "Revert to using epoll_wait()." into gingerbreadJeff Brown2010-10-141-4/+4
| |\ \ \
| | * | | Revert to using epoll_wait().Jeff Brown2010-10-071-4/+4
* | | | | am d4e03f37: addresses parts of 3096779 and 3097475Mathias Agopian2010-10-141-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | addresses parts of 3096779 and 3097475Mathias Agopian2010-10-141-0/+5
| | |/ / | |/| |
* | | | am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbreadKenny Root2010-10-131-0/+27
|\ \ \ \ | |/ / /
| * | | Merge "OBB: use PBKDF2 for key generation." into gingerbreadKenny Root2010-10-131-0/+27
| |\ \ \
| | * | | OBB: use PBKDF2 for key generation.Kenny Root2010-10-131-0/+27
* | | | | am 011b5bcc: Merge "implement part of [3094280] New animation for screen on a...Mathias Agopian2010-10-131-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "implement part of [3094280] New animation for screen on and screen off...Mathias Agopian2010-10-131-1/+3
| |\ \ \ \
| | * | | | implement part of [3094280] New animation for screen on and screen offMathias Agopian2010-10-131-1/+3
| | |/ / /
* | | | | am 312644cd: Merge "Support for writing to MPEG2 transport stream files." int...Andreas Huber2010-10-132-0/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Support for writing to MPEG2 transport stream files." into gingerbreadAndreas Huber2010-10-132-0/+8
| |\ \ \ \
| | * | | | Support for writing to MPEG2 transport stream files.Andreas Huber2010-10-122-0/+8
* | | | | | am 165c6579: Merge "HTTP Live content that are tagged as complete are now see...Andreas Huber2010-10-131-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "HTTP Live content that are tagged as complete are now seekable." into ...Andreas Huber2010-10-131-0/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | HTTP Live content that are tagged as complete are now seekable.Andreas Huber2010-10-121-0/+1
| | |/ / /
* | | | | am ba799098: Merge changes I76513387,I335fb671 into gingerbreadJoe Onorato2010-10-121-1/+4
|\ \ \ \ \ | |/ / / /
| * | | | turn off the electron beamMathias Agopian2010-10-121-1/+4