Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d | Mark Salyzyn | 2014-04-15 | 32 | -237/+131 |
|\ | |||||
| * | am 839d11d1: Merge changes I0a744dc7,Id993a70d | Mark Salyzyn | 2014-04-15 | 34 | -239/+133 |
| |\ | |||||
| | * | Merge changes I0a744dc7,Id993a70d | Mark Salyzyn | 2014-04-15 | 34 | -239/+133 |
| | |\ | |||||
| | | * | media: use size_t for integer iterator to Vector::size() | Mark Salyzyn | 2014-04-15 | 8 | -22/+22 |
| | | * | media: 64 bit compile issues | Mark Salyzyn | 2014-04-15 | 28 | -221/+115 |
| | |/ | |||||
* | | | am d4a3cae8: am 1df2557a: Merge "Remove code markers" | Dmitriy Ivanov | 2014-04-15 | 1 | -78/+0 |
|\ \ \ | |/ / | |||||
| * | | am 1df2557a: Merge "Remove code markers" | Dmitriy Ivanov | 2014-04-15 | 1 | -78/+0 |
| |\ \ | | |/ | |||||
| | * | Merge "Remove code markers" | Dmitriy Ivanov | 2014-04-15 | 1 | -78/+0 |
| | |\ | |||||
| | | * | Remove code markers | Dmitriy Ivanov | 2014-04-15 | 1 | -78/+0 |
| | |/ | |||||
* | | | am 6bb7a891: am 432ed3d6: Merge "libstagefright: fix 64-bit warnings" | Mark Salyzyn | 2014-04-15 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | am 432ed3d6: Merge "libstagefright: fix 64-bit warnings" | Mark Salyzyn | 2014-04-15 | 14 | -46/+54 |
| |\ \ | | |/ | |||||
| | * | Merge "libstagefright: fix 64-bit warnings" | Mark Salyzyn | 2014-04-15 | 14 | -46/+54 |
| | |\ | |||||
| | | * | libstagefright: fix 64-bit warnings | Colin Cross | 2014-04-14 | 14 | -46/+54 |
| | |/ | |||||
* | | | Merge "Camera: don't dereference timestamp if it is missing" | Zhijun He | 2014-04-15 | 1 | -6/+9 |
|\ \ \ | |||||
| * | | | Camera: don't dereference timestamp if it is missing | Zhijun He | 2014-04-14 | 1 | -6/+9 |
* | | | | Merge "Improve resampler filter computation speed" | Andy Hung | 2014-04-15 | 1 | -1/+25 |
|\ \ \ \ | |||||
| * | | | | Improve resampler filter computation speed | Andy Hung | 2014-04-02 | 1 | -1/+25 |
* | | | | | Merge "audioflinger: forward device change to effects in direct thread" | Glenn Kasten | 2014-04-14 | 1 | -0/+10 |
|\ \ \ \ \ | |||||
| * | | | | | audioflinger: forward device change to effects in direct thread | Glenn Kasten | 2014-04-14 | 1 | -0/+10 |
| | |/ / / | |/| | | | |||||
* | | | | | am 29fe1ea4: am 9829344d: Merge "media: memset sizeof argument issues" | Mark Salyzyn | 2014-04-14 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | am 9829344d: Merge "media: memset sizeof argument issues" | Mark Salyzyn | 2014-04-14 | 3 | -3/+3 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge "media: memset sizeof argument issues" | Mark Salyzyn | 2014-04-14 | 3 | -3/+3 |
| | |\ \ | |||||
| | | * | | media: memset sizeof argument issues | Mark Salyzyn | 2014-04-11 | 3 | -3/+3 |
* | | | | | Merge "Update test-resample to handle multichannel" | Andy Hung | 2014-04-12 | 1 | -57/+48 |
|\ \ \ \ \ | |||||
| * | | | | | Update test-resample to handle multichannel | Andy Hung | 2014-04-10 | 1 | -57/+48 |
* | | | | | | am b1b1e303: am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build 1119... | Mark Salyzyn | 2014-04-11 | 2 | -2/+2 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build 1119326" | Mark Salyzyn | 2014-04-11 | 3 | -6/+6 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge "Fix aosp_arm64 mirror-aosp-master build 1119326" | Mark Salyzyn | 2014-04-11 | 3 | -6/+6 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | Fix aosp_arm64 mirror-aosp-master build 1119326 | Mark Salyzyn | 2014-04-11 | 3 | -6/+6 |
| | |/ / / | |||||
* | | | | | Revert "build fix for aosp-idea133 @ 1119318" | Colin Cross | 2014-04-11 | 1 | -0/+1 |
* | | | | | am a7281ee1: am a133bc87: Merge "build fix for aosp-idea133 @ 1119318" | Mark Salyzyn | 2014-04-11 | 1 | -1/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am a133bc87: Merge "build fix for aosp-idea133 @ 1119318" | Mark Salyzyn | 2014-04-11 | 1 | -1/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "build fix for aosp-idea133 @ 1119318" | Mark Salyzyn | 2014-04-11 | 1 | -1/+0 |
| | |\ \ \ | |||||
| | | * | | | build fix for aosp-idea133 @ 1119318 | Mark Salyzyn | 2014-04-11 | 1 | -1/+0 |
* | | | | | | am 4cd0d582: am 0938c6f7: Merge "warnings be gone (4/4)" | Mark Salyzyn | 2014-04-11 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 0938c6f7: Merge "warnings be gone (4/4)" | Mark Salyzyn | 2014-04-11 | 1 | -2/+4 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "warnings be gone (4/4)" | Mark Salyzyn | 2014-04-11 | 1 | -2/+4 |
| | |\ \ \ \ | |||||
| | | * | | | | warnings be gone (4/4) | Mark Salyzyn | 2014-04-11 | 1 | -2/+4 |
| | |/ / / / | |||||
* | | | | | | am 8819b515: am 2a27a640: Merge "warnings be gone (3/4)" | Mark Salyzyn | 2014-04-11 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 2a27a640: Merge "warnings be gone (3/4)" | Mark Salyzyn | 2014-04-11 | 1 | -2/+4 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "warnings be gone (3/4)" | Mark Salyzyn | 2014-04-11 | 1 | -2/+4 |
| | |\ \ \ \ | |||||
| | | * | | | | warnings be gone (3/4) | Mark Salyzyn | 2014-04-11 | 1 | -2/+4 |
| | |/ / / / | |||||
* | | | | | | am 355c04df: am 79724856: Merge "warnings be gone (2/4)" | Mark Salyzyn | 2014-04-11 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 79724856: Merge "warnings be gone (2/4)" | Mark Salyzyn | 2014-04-11 | 1 | -5/+5 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "warnings be gone (2/4)" | Mark Salyzyn | 2014-04-11 | 1 | -5/+5 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | warnings be gone (2/4) | Mark Salyzyn | 2014-04-11 | 1 | -5/+5 |
| | |/ / / | |||||
* | | | | | am dd01ce9c: am 52a861d2: Merge "warnings be gone." | Mark Salyzyn | 2014-04-11 | 0 | -0/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 52a861d2: Merge "warnings be gone." | Mark Salyzyn | 2014-04-11 | 70 | -161/+211 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "warnings be gone." | Mark Salyzyn | 2014-04-11 | 70 | -161/+211 |
| | |\ \ \ | |||||
| | | * | | | warnings be gone. | Andreas Huber | 2014-04-11 | 70 | -161/+211 |
| | |/ / / |