Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge "Fix uninitialized variable" | Chih-hung Hsieh | 2014-11-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Fix uninitialized variable | Bernhard Rosenkränzer | 2014-11-18 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge "No need to #include atomic-inline.h if you have atomic.h." | Elliott Hughes | 2014-11-17 | 1 | -1/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | No need to #include atomic-inline.h if you have atomic.h. | Elliott Hughes | 2014-11-17 | 1 | -1/+0 | |
|/ / / / / / | ||||||
* | | | | | | Merge "Fix struct vs. class mismatches" | Chih-hung Hsieh | 2014-11-17 | 13 | -15/+14 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix struct vs. class mismatches | Bernhard Rosenkränzer | 2014-11-17 | 13 | -15/+14 | |
* | | | | | | | Merge "libcutils no longer requires that its users configure ANDROID_SMP." | Elliott Hughes | 2014-11-17 | 2 | -9/+0 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | libcutils no longer requires that its users configure ANDROID_SMP. | Elliott Hughes | 2014-11-17 | 2 | -9/+0 | |
|/ / / / / / | ||||||
* | | | | | | Merge "Update calls to IInterface::asBinder()" | Marco Nelissen | 2014-11-17 | 55 | -145/+143 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | Update calls to IInterface::asBinder() | Marco Nelissen | 2014-11-17 | 55 | -145/+143 | |
|/ / / / / | ||||||
* | | | | | Merge "Move libldnhncr to libc++." | Dan Albert | 2014-11-16 | 1 | -1/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | Move libldnhncr to libc++. | Dan Albert | 2014-11-15 | 1 | -1/+0 | |
|/ / / / / | ||||||
* | | | | | Merge "Include AudioPolicyInterface.h only when needed." | Chih-Hung Hsieh | 2014-11-15 | 2 | -0/+3 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Include AudioPolicyInterface.h only when needed. | Chih-Hung Hsieh | 2014-11-14 | 2 | -0/+3 | |
|/ / / / | ||||||
* | | | | Merge "libstagefright: use __predict_false from bionic rather than CONDITION ... | Mark Salyzyn | 2014-11-12 | 1 | -1/+1 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | libstagefright: use __predict_false from bionic rather than CONDITION from lo... | Mark Salyzyn | 2014-11-11 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge "Move to libc++." | Dan Albert | 2014-11-11 | 3 | -23/+3 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Move to libc++. | Dan Albert | 2014-11-11 | 3 | -23/+3 | |
|/ / | ||||||
* | | Merge "Camera: Guard against asBinder() calls on NULL interfaces" | Eino-Ville Talvala | 2014-11-10 | 7 | -17/+27 | |
|\ \ | ||||||
| * | | Camera: Guard against asBinder() calls on NULL interfaces | Eino-Ville Talvala | 2014-11-07 | 7 | -17/+27 | |
* | | | Merge "Remove the executable bit from source files" | Glenn Kasten | 2014-11-10 | 91 | -0/+0 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Remove the executable bit from source files | Martin Storsjo | 2014-11-07 | 91 | -0/+0 | |
|/ / | ||||||
* | | Resolve conflict | The Android Open Source Project | 2014-11-06 | 864 | -122269/+75117 | |
|\ \ | ||||||
| * \ | am 686a0c4d: Merge "MTP Device: Parse USB3 descriptor for MTP initor;" | Mike Lockwood | 2014-10-29 | 1 | -0/+9 | |
| |\ \ | ||||||
| * \ \ | am d5923409: mediaplayer: limit scheduling video frames into the future | Lajos Molnar | 2014-10-21 | 2 | -1/+43 | |
| |\ \ \ | ||||||
| | * | | | mediaplayer: limit scheduling video frames into the future | Lajos Molnar | 2014-10-20 | 2 | -1/+43 | |
| * | | | | am eecb7805: NuPlayer: set anchor time for each audio buffer. | Ronghua Wu | 2014-10-21 | 2 | -36/+48 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | NuPlayer: set anchor time for each audio buffer. | Ronghua Wu | 2014-10-20 | 2 | -36/+48 | |
| * | | | | am ac302143: Fix the fix | Marco Nelissen | 2014-10-20 | 1 | -1/+3 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Fix the fix | Marco Nelissen | 2014-10-20 | 1 | -1/+3 | |
| * | | | | am 22bc10a3: Merge "Clear effect buffer before sending to chain" into lmp-dev | Marco Nelissen | 2014-10-20 | 1 | -4/+3 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Merge "Clear effect buffer before sending to chain" into lmp-dev | Marco Nelissen | 2014-10-20 | 1 | -4/+3 | |
| | |\ \ \ | ||||||
| | | * | | | Clear effect buffer before sending to chain | Marco Nelissen | 2014-10-17 | 1 | -4/+3 | |
| * | | | | | am e9234f17: Merge "Fix AudioTrack retrograde getPosition when restoring trac... | Andy Hung | 2014-10-17 | 1 | -1/+4 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Merge "Fix AudioTrack retrograde getPosition when restoring tracks" into lmp-dev | Andy Hung | 2014-10-17 | 1 | -1/+4 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Fix AudioTrack retrograde getPosition when restoring tracks | Andy Hung | 2014-10-17 | 1 | -1/+4 | |
| * | | | | | | Merge "move audio sink open/close to NuPlayerRenderer" into lmp-dev | Chong Zhang | 2014-10-17 | 4 | -123/+223 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Merge "move audio sink open/close to NuPlayerRenderer" into lmp-dev | Chong Zhang | 2014-10-17 | 4 | -123/+223 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | move audio sink open/close to NuPlayerRenderer | Chong Zhang | 2014-10-16 | 4 | -123/+223 | |
| | | |/ / / / | ||||||
| * | | | | | | am 8a8f2fdc: am 589a89f5: Merge "Add -no-integrated-as at local level." | Chih-Hung Hsieh | 2014-10-16 | 1 | -0/+2 | |
| |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ | am 589a89f5: Merge "Add -no-integrated-as at local level." | Chih-Hung Hsieh | 2014-10-16 | 1 | -0/+2 | |
| | |\ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ | am c40da54b: Merge "Fix freed memory references" into lmp-dev | Lajos Molnar | 2014-10-16 | 1 | -3/+8 | |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | ||||||
| | * | | | | | | | Merge "Fix freed memory references" into lmp-dev | Lajos Molnar | 2014-10-16 | 1 | -3/+8 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Fix freed memory references | Marco Nelissen | 2014-10-16 | 1 | -3/+8 | |
| | | | |_|_|/ / / | | | |/| | | | | | ||||||
| * | | | | | | | | am 4b21635d: am b6dcdbf4: (-s ours) Revert "audio: prevent larger than requir... | Chris Elliott | 2014-10-16 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | am b6dcdbf4: (-s ours) Revert "audio: prevent larger than required sleeps - D... | Chris Elliott | 2014-10-16 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Revert "audio: prevent larger than required sleeps - DO NOT MERGE" | Chris Elliott | 2014-10-16 | 1 | -21/+1 | |
| * | | | | | | | | | am a2d4a6da: audio policy: Fix for voice call audio loss | Haynes Mathew George | 2014-10-16 | 1 | -0/+20 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | audio policy: Fix for voice call audio loss | Haynes Mathew George | 2014-10-15 | 1 | -0/+20 | |
| * | | | | | | | | | am 05c0d7d7: am 620208dc: (-s ours) audio: prevent larger than required sleep... | Chris Elliott | 2014-10-15 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / |