summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 903f037a: am 983cf231: Dynamically configure the number of video buffers u...James Dong2012-08-025-11/+63
|\
| * am 983cf231: Dynamically configure the number of video buffers used by camera...James Dong2012-08-025-11/+63
| |\
| | * Dynamically configure the number of video buffers used by camera source, if s...James Dong2012-08-025-11/+63
* | | am 22c875ae: am 15d7245e: Merge "Camera2: Fix exposure compensation step valu...Eino-Ville Talvala2012-08-021-1/+1
|\ \ \ | |/ /
| * | am 15d7245e: Merge "Camera2: Fix exposure compensation step value." into jb-m...Eino-Ville Talvala2012-08-021-1/+1
| |\ \ | | |/
| | * Merge "Camera2: Fix exposure compensation step value." into jb-mr1-devEino-Ville Talvala2012-08-021-1/+1
| | |\
| | | * Camera2: Fix exposure compensation step value.Eino-Ville Talvala2012-08-021-1/+1
* | | | am 3b1069c5: am 1bf1c000: Merge "Camera2: Minor logging updates." into jb-mr1...Eino-Ville Talvala2012-08-021-4/+13
|\ \ \ \ | |/ / /
| * | | am 1bf1c000: Merge "Camera2: Minor logging updates." into jb-mr1-devEino-Ville Talvala2012-08-021-4/+13
| |\ \ \ | | |/ /
| | * | Merge "Camera2: Minor logging updates." into jb-mr1-devEino-Ville Talvala2012-08-021-4/+13
| | |\ \ | | | |/
| | | * Camera2: Minor logging updates.Eino-Ville Talvala2012-08-021-4/+13
* | | | am 028488ec: am 4a76bcea: Merge "Camera2: Check PIDs to ensure camera exclusi...Eino-Ville Talvala2012-08-022-8/+69
|\ \ \ \ | |/ / /
| * | | am 4a76bcea: Merge "Camera2: Check PIDs to ensure camera exclusive access." i...Eino-Ville Talvala2012-08-022-8/+69
| |\ \ \ | | |/ /
| | * | Merge "Camera2: Check PIDs to ensure camera exclusive access." into jb-mr1-devEino-Ville Talvala2012-08-022-8/+69
| | |\ \ | | | |/
| | | * Camera2: Check PIDs to ensure camera exclusive access.Eino-Ville Talvala2012-08-022-8/+69
* | | | am c249e7b7: am ac9b9600: Merge "Allocate buffers before calling start on its...James Dong2012-08-022-5/+18
|\ \ \ \ | |/ / /
| * | | am ac9b9600: Merge "Allocate buffers before calling start on its source in OM...James Dong2012-08-022-5/+18
| |\ \ \ | | |/ /
| | * | Merge "Allocate buffers before calling start on its source in OMXCodec::start...James Dong2012-08-022-5/+18
| | |\ \
| | | * | Allocate buffers before calling start on its source in OMXCodec::start() for ...James Dong2012-08-022-5/+18
* | | | | am dfc7371e: am 9cb20d4a: am a9ab66c5: (-s ours) am ffd99cb7: Merge "Shutter ...Eino-Ville Talvala2012-08-020-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 9cb20d4a: am a9ab66c5: (-s ours) am ffd99cb7: Merge "Shutter sound is hear...Eino-Ville Talvala2012-08-020-0/+0
| |\ \ \ \ | | |/ / /
| | * | | am a9ab66c5: (-s ours) am ffd99cb7: Merge "Shutter sound is heard at the end ...Eino-Ville Talvala2012-08-020-0/+0
| | |\ \ \ | | | |/ / | | |/| |
| | | * | am ffd99cb7: Merge "Shutter sound is heard at the end of the recorded video"Eino-Ville Talvala2012-08-011-1/+1
| | | |\ \
| | | | * \ Merge "Shutter sound is heard at the end of the recorded video"Eino-Ville Talvala2012-08-011-1/+1
| | | | |\ \
| | | | | * | Shutter sound is heard at the end of the recorded videoPatric Frederiksen2012-07-101-1/+1
| | | | |/ /
* | | | | | am f6f6cfc1: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-020-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-020-0/+0
| |\ \ \ \ \
| | * \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-020-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
* | | | | | | am cc788456: am c9729ca1: Unifying TimedTextDriver\'s resume() and start().Insun Kang2012-08-022-23/+20
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c9729ca1: Unifying TimedTextDriver\'s resume() and start().Insun Kang2012-08-012-23/+20
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Unifying TimedTextDriver's resume() and start().Insun Kang2012-08-022-23/+20
* | | | | | | am 249ab517: am 6472badc: Fix: status checking in TimedTextDriver.Insun Kang2012-08-023-32/+84
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 6472badc: Fix: status checking in TimedTextDriver.Insun Kang2012-08-013-32/+84
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix: status checking in TimedTextDriver.Insun Kang2012-08-023-32/+84
* | | | | | | am dd43ebd3: am bb6bc849: Adds resume() functionInsun Kang2012-08-024-13/+52
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am bb6bc849: Adds resume() functionInsun Kang2012-08-014-13/+52
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Adds resume() functionInsun Kang2012-08-024-13/+52
* | | | | | | am 141e0810: am 2f0632f1: Adjust fire time of a timed text message before fir...Insun Kang2012-08-022-18/+40
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 2f0632f1: Adjust fire time of a timed text message before firing it.Insun Kang2012-08-012-18/+40
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Adjust fire time of a timed text message before firing it.Insun Kang2012-08-022-18/+40
* | | | | | | am 58defc8e: am 9007619d: Merge "Shutter sound is heard at the end of the rec...Eino-Ville Talvala2012-08-020-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 9007619d: Merge "Shutter sound is heard at the end of the recorded video" ...Eino-Ville Talvala2012-08-010-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Shutter sound is heard at the end of the recorded video" into jb-mr1-devEino-Ville Talvala2012-08-011-1/+1
| | |\ \ \ \ \
| | | * | | | | Shutter sound is heard at the end of the recorded videoPatric Frederiksen2012-08-011-1/+1
* | | | | | | | am 174e8f67: Shutter sound is heard at the end of the recorded videoPatric Frederiksen2012-08-021-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Shutter sound is heard at the end of the recorded videoPatric Frederiksen2012-08-011-1/+1
* | | | | | | | am b2676a29: am 44cda3a4: Don\'t wait for presentation complete if terminatedGlenn Kasten2012-08-011-6/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 44cda3a4: Don\'t wait for presentation complete if terminatedGlenn Kasten2012-08-011-6/+6
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Don't wait for presentation complete if terminatedGlenn Kasten2012-08-011-6/+6
* | | | | | | | am e58b04ec: am 3788a393: Merge "Allows MediaMetadataRetriever to retrieve vi...James Dong2012-08-012-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /